patch-2.4.0-test10 linux/arch/alpha/kernel/sys_wildfire.c

• Lines: 30
• Date: Mon Oct 30 12:24:22 2000
• Orig file: v2.4.0-test9/linux/arch/alpha/kernel/sys_wildfire.c
• Orig date: Mon Jun 19 17:59:32 2000

diff -u --recursive --new-file v2.4.0-test9/linux/arch/alpha/kernel/sys_wildfire.c linux/arch/alpha/kernel/sys_wildfire.c
@@ -302,7 +302,7 @@
 static int __init
 wildfire_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[8][5] __initlocaldata = {
+	static char irq_tab[8][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		{ -1,    -1,    -1,    -1,    -1}, /* IdSel 0 ISA Bridge */
 		{ 36,    36,    36+1, 36+2, 36+3}, /* IdSel 1 SCSI builtin */
@@ -326,11 +326,6 @@
 	return irq;
 }
 
-static void __init
-wildfire_init_pci(void)
-{
-	common_init_pci();
-}
 
 /*
  * The System Vectors
@@ -353,7 +348,7 @@
 	init_arch:		wildfire_init_arch,
 	init_irq:		wildfire_init_irq,
 	init_rtc:		common_init_rtc,
-	init_pci:		wildfire_init_pci,
+	init_pci:		common_init_pci,
 	kill_arch:		wildfire_kill_arch,
 	pci_map_irq:		wildfire_map_irq,
 	pci_swizzle:		common_swizzle,