git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
mips
/
tx4927
/
toshiba_rbtx4927
/
toshiba_rbtx4927_irq.c
diff --git
a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
index
b0f021f
..
0c3c3f6
100644
(file)
--- a/
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@
-127,9
+127,9
@@
JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
#include <asm/irq.h>
#include <asm/pci.h>
#include <asm/processor.h>
#include <asm/irq.h>
#include <asm/pci.h>
#include <asm/processor.h>
-#include <asm/ptrace.h>
#include <asm/reboot.h>
#include <asm/time.h>
#include <asm/reboot.h>
#include <asm/time.h>
+#include <asm/wbflush.h>
#include <linux/bootmem.h>
#include <linux/blkdev.h>
#ifdef CONFIG_RTC_DS1742
#include <linux/bootmem.h>
#include <linux/blkdev.h>
#ifdef CONFIG_RTC_DS1742