patch-2.2.19 linux/drivers/block/ll_rw_blk.c

• Lines: 23
• Date: Sun Mar 25 11:37:30 2001
• Orig file: v2.2.18/drivers/block/ll_rw_blk.c
• Orig date: Sun Mar 25 11:28:21 2001

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.18/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c
@@ -24,6 +24,10 @@
 #include <asm/uaccess.h>
 #include <linux/blk.h>
 
+#ifdef CONFIG_POWERMAC
+#include <asm/ide.h>
+#endif
+
 #include <linux/module.h>
 
 /*
@@ -971,7 +975,11 @@
 	isp16_init();
 #endif CONFIG_ISP16_CDI
 #ifdef CONFIG_BLK_DEV_IDE
+#ifdef CONFIG_POWERMAC
+	ide_pmac_init();
+#else
 	ide_init();		/* this MUST precede hd_init */
+#endif
 #endif
 #ifdef CONFIG_BLK_DEV_HD
 	hd_init();