patch-1.3.19 linux/init/main.c

• Lines: 29
• Date: Sun Aug 13 20:19:12 1995
• Orig file: v1.3.18/linux/init/main.c
• Orig date: Tue Aug 8 12:31:42 1995

diff -u --recursive --new-file v1.3.18/linux/init/main.c linux/init/main.c
@@ -160,13 +160,7 @@
 #ifdef CONFIG_SCSI
 	{ "max_scsi_luns=", scsi_luns_setup },
 #endif
-#ifdef CONFIG_BLK_DEV_IDE
-	{ "hda=", hda_setup },
-	{ "hdb=", hdb_setup },
-	{ "hdc=", hdc_setup },
-	{ "hdd=", hdd_setup },
-	{ "hd=",  ide_setup },
-#elif defined(CONFIG_BLK_DEV_HD)
+#if defined(CONFIG_BLK_DEV_HD)
 	{ "hd=", hd_setup },
 #endif
 #ifdef CONFIG_CHR_DEV_ST
@@ -253,6 +247,13 @@
 	int i = 0;
 	int ints[11];
 
+#ifdef CONFIG_BLK_DEV_IDE
+	/* ide driver needs the basic string, rather than pre-processed values */
+	if (!strncmp(line,"ide",3) || (!strncmp(line,"hd",2) && line[2] != '=')) {
+		ide_setup(line);
+		return 1;
+	}
+#endif
 	while (bootsetups[i].str) {
 		int n = strlen(bootsetups[i].str);
 		if (!strncmp(line,bootsetups[i].str,n)) {