patch-2.2.18 linux/drivers/block/rd.c

• Lines: 22
• Date: Wed Nov 8 23:00:34 2000
• Orig file: v2.2.17/drivers/block/rd.c
• Orig date: Sat Sep 9 18:42:34 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/block/rd.c linux/drivers/block/rd.c
@@ -614,9 +614,11 @@
 #ifdef CONFIG_MAC_FLOPPY
 		if(MAJOR(ROOT_DEV) == FLOPPY_MAJOR)
 			swim3_fd_eject(MINOR(ROOT_DEV));
+#ifdef CONFIG_BLK_DEV_INITRD
 		else if(MAJOR(real_root_dev) == FLOPPY_MAJOR)
 			swim3_fd_eject(MINOR(real_root_dev));
 #endif
+#endif
 		printk(KERN_NOTICE
 		       "VFS: Insert root floppy disk to be loaded into RAM disk and press ENTER\n");
 		wait_for_keypress();
@@ -653,7 +655,9 @@
 
 #define OF(args)  args
 
+#ifndef memzero
 #define memzero(s, n)     memset ((s), 0, (n))
+#endif
 
 
 typedef unsigned char  uch;