patch-2.3.29 linux/arch/alpha/kernel/sys_sio.c

• Lines: 56
• Date: Tue Nov 23 10:10:38 1999
• Orig file: v2.3.28/linux/arch/alpha/kernel/sys_sio.c
• Orig date: Sat Oct 9 11:47:50 1999

diff -u --recursive --new-file v2.3.28/linux/arch/alpha/kernel/sys_sio.c linux/arch/alpha/kernel/sys_sio.c
@@ -55,7 +55,7 @@
 }
 
 static inline void __init
-xl_init_arch(unsigned long *mem_start, unsigned long *mem_end)
+xl_init_arch(void)
 {
 	struct pci_controler *hose;
 
@@ -93,7 +93,7 @@
 	 * Create our single hose.
 	 */
 
-	hose = alloc_pci_controler(mem_start);
+	hose = alloc_pci_controler();
 	hose->io_space = &ioport_resource;
 	hose->mem_space = &iomem_resource;
 	hose->config_space = LCA_CONF;
@@ -101,7 +101,7 @@
 }
 
 static inline void __init
-alphabook1_init_arch(unsigned long *mem_start, unsigned long *mem_end)
+alphabook1_init_arch(void)
 {
 	/* The AlphaBook1 has LCD video fixed at 800x600,
 	   37 rows and 100 cols. */
@@ -109,7 +109,7 @@
 	screen_info.orig_video_cols = 100;
 	screen_info.orig_video_lines = 37;
 
-	lca_init_arch(mem_start, mem_end);
+	lca_init_arch();
 }
 
 
@@ -238,8 +238,8 @@
 static inline void __init
 noname_init_pci(void)
 {
-	sio_pci_route();
 	common_init_pci();
+	sio_pci_route();
 	sio_fixup_irq_levels(sio_collect_irq_levels());
 	ns87312_enable_ide(0x26e);
 }
@@ -250,8 +250,8 @@
 	struct pci_dev *dev;
 	unsigned char orig, config;
 
-	sio_pci_route();
 	common_init_pci();
+	sio_pci_route();
 
 	/*
 	 * On the AlphaBook1, the PCMCIA chip (Cirrus 6729)