patch-2.3.13 linux/drivers/block/genhd.c

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

diff -u --recursive --new-file v2.3.12/linux/drivers/block/genhd.c linux/drivers/block/genhd.c
@@ -85,6 +85,10 @@
 	 * This requires special handling here.
 	 */
 	switch (hd->major) {
+		case IDE9_MAJOR:
+			unit += 2;
+		case IDE8_MAJOR:
+			unit += 2;
 		case IDE7_MAJOR:
 			unit += 2;
 		case IDE6_MAJOR:
@@ -1383,7 +1387,7 @@
 		resetup_one_dev(dev, drive);
 }
 
-void __init device_setup(void)
+static int __init device_setup(void)
 {
 	extern void console_map_init(void);
 	extern void cpqarray_init(void);
@@ -1441,7 +1445,10 @@
 #ifdef CONFIG_MD_BOOT
         md_setup_drive();
 #endif
+	return 0;
 }
+
+__initcall(device_setup);
 
 #ifdef CONFIG_PROC_FS
 int get_partition_list(char * page)

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