X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fmips%2Ftx4927%2Ftoshiba_rbtx4927%2Ftoshiba_rbtx4927_irq.c;h=9303045854439f9020873c90df3a7841a873ab1f;hb=6f71f83334a552167ccbbd42fe5dd979428c89e4;hp=ac3dbb597a81072ccf014015dad3f77f61440dfb;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c index ac3dbb597..930304585 100644 --- 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 #include #ifdef CONFIG_RTC_DS1742 -#include +#include #endif #ifdef CONFIG_TOSHIBA_FPCIB0 -#include +#include #endif #include @@ -665,7 +665,7 @@ static void toshiba_rbtx4927_irq_isa_end(unsigned int irq) #endif -void __init arch_init_irq(void) +void __init init_IRQ(void) { extern void tx4927_irq_init(void); @@ -681,6 +681,13 @@ void __init arch_init_irq(void) } #endif +#ifdef CONFIG_PCI + { + extern void toshiba_rbtx4927_pci_irq_init(void); + toshiba_rbtx4927_pci_irq_init(); + } +#endif + wbflush(); return;