git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
kernel
/
cevt-gt641xx.c
diff --git
a/arch/mips/kernel/cevt-gt641xx.c
b/arch/mips/kernel/cevt-gt641xx.c
index c36772631fe0e7b9524fbfe2ad6ed4b6da9435f4..6e2f58520afbdba949fb839ebfd66df78e4df364 100644
(file)
--- a/
arch/mips/kernel/cevt-gt641xx.c
+++ b/
arch/mips/kernel/cevt-gt641xx.c
@@
-25,8
+25,6
@@
#include <asm/gt64120.h>
#include <asm/time.h>
-#include <irq.h>
-
static DEFINE_SPINLOCK(gt641xx_timer_lock);
static unsigned int gt641xx_base_clock;