git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.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
ac3dbb5
..
9303045
100644
(file)
--- a/
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@
-134,10
+134,10
@@
JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
#include <linux/bootmem.h>
#include <linux/blkdev.h>
#ifdef CONFIG_RTC_DS1742
#include <linux/bootmem.h>
#include <linux/blkdev.h>
#ifdef CONFIG_RTC_DS1742
-#include <
linux/ds1742rtc
.h>
+#include <
asm/rtc_ds1742
.h>
#endif
#ifdef CONFIG_TOSHIBA_FPCIB0
#endif
#ifdef CONFIG_TOSHIBA_FPCIB0
-#include <asm/
tx4927/
smsc_fdc37m81x.h>
+#include <asm/smsc_fdc37m81x.h>
#endif
#include <asm/tx4927/toshiba_rbtx4927.h>
#endif
#include <asm/tx4927/toshiba_rbtx4927.h>
@@
-665,7
+665,7
@@
static void toshiba_rbtx4927_irq_isa_end(unsigned int irq)
#endif
#endif
-void __init
arch_init_irq
(void)
+void __init
init_IRQ
(void)
{
extern void tx4927_irq_init(void);
{
extern void tx4927_irq_init(void);
@@
-681,6
+681,13
@@
void __init arch_init_irq(void)
}
#endif
}
#endif
+#ifdef CONFIG_PCI
+ {
+ extern void toshiba_rbtx4927_pci_irq_init(void);
+ toshiba_rbtx4927_pci_irq_init();
+ }
+#endif
+
wbflush();
return;
wbflush();
return;