patch-2.3.16 linux/drivers/block/xd.c

Next file: linux/drivers/cdrom/cdrom.c
Previous file: linux/drivers/block/via82c586.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/drivers/block/xd.c linux/drivers/block/xd.c
@@ -194,7 +194,7 @@
 }
 
 /* xd_detect: scan the possible BIOS ROM locations for the signature strings */
-static __init u_char xd_detect (u_char *controller, unsigned int *address)
+static u_char __init xd_detect (u_char *controller, unsigned int *address)
 {
 	u_char i,j,found = 0;
 
@@ -1204,5 +1204,10 @@
 			xd_dma_mem_free((unsigned long)xd_dma_buffer, xd_maxsectors * 0x200);
 	}
 }
+#else
+
+__setup ("xd=", xd_setup);
+__setup ("xd_geo=", xd_manual_geo_init);
+
 #endif /* MODULE */
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)