patch-2.3.43 linux/drivers/block/ide-probe.c

• Lines: 18
• Date: Wed Feb 9 19:43:53 2000
• Orig file: v2.3.42/linux/drivers/block/ide-probe.c
• Orig date: Fri Jan 28 15:09:07 2000

diff -u --recursive --new-file v2.3.42/linux/drivers/block/ide-probe.c linux/drivers/block/ide-probe.c
@@ -117,8 +117,16 @@
 				}
 				type = ide_cdrom;	/* Early cdrom models used zero */
 			case ide_cdrom:
-				printk ("CDROM");
 				drive->removable = 1;
+#ifdef CONFIG_PPC
+				/* kludge for Apple PowerBook internal zip */
+				if (!strstr(id->model, "CD-ROM") && strstr(id->model, "ZIP")) {
+					printk ("FLOPPY");
+					type = ide_floppy;
+					break;
+				}
+#endif
+				printk ("CDROM");
 				break;
 			case ide_tape:
 				printk ("TAPE");