patch-2.4.0-test1 linux/drivers/ide/ide-geometry.c

• Lines: 15
• Date: Wed May 24 08:40:41 2000
• Orig file: v2.3.99-pre9/linux/drivers/ide/ide-geometry.c
• Orig date: Mon Mar 27 08:08:24 2000

diff -u --recursive --new-file v2.3.99-pre9/linux/drivers/ide/ide-geometry.c linux/drivers/ide/ide-geometry.c
@@ -3,7 +3,7 @@
  */
 #include <linux/config.h>
 
-#ifdef CONFIG_IDE
+#if defined(CONFIG_IDE) && !defined(CONFIG_BLK_DEV_HD)
 #include <linux/ide.h>
 
 #include <asm/io.h>
@@ -211,4 +211,4 @@
 		       drive->bios_cyl, drive->bios_head, drive->bios_sect);
 	return ret;
 }
-#endif /* CONFIG_IDE */
+#endif /* (CONFIG_IDE) && !(CONFIG_BLK_DEV_HD) */