--- linux/arch/ppc/kernel/pmac_setup.c	Sun Aug  8 21:26:26 1999
+++ linux-ideok/arch/ppc/kernel/pmac_setup.c	Sun Aug  8 19:12:16 1999
@@ -41,6 +41,7 @@
 #include <linux/blk.h>
 #include <linux/vt_kern.h>
 #include <linux/console.h>
+#include <linux/ide.h>
 #include <asm/prom.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -53,7 +54,6 @@
 #include <asm/ohare.h>
 #include <asm/mediabay.h>
 #include <asm/feature.h>
-#include <asm/ide.h>
 #include <asm/machdep.h>
 
 #include "time.h"
@@ -550,10 +550,12 @@
  * This registers the standard ports for this architecture with the IDE
  * driver.
  */
+/* It is already defined in include/asm-ppc/ide.h
 void
 ide_init_default_hwifs(void)
 {
 }
+ */
 #endif
 
 __initfunc(void
--- linux/arch/ppc/kernel/chrp_pci.c	Sat Aug  7 17:09:39 1999
+++ linux-ideok/arch/ppc/kernel/chrp_pci.c	Sat Aug  7 17:33:51 1999
@@ -8,6 +8,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/openpic.h>
+#include <linux/ide.h>
 
 #include <asm/io.h>
 #include <asm/pgtable.h>
@@ -15,7 +16,6 @@
 #include <asm/hydra.h>
 #include <asm/prom.h>
 #include <asm/gg2.h>
-#include <asm/ide.h>
 #include <asm/machdep.h>
 
 #include "pci.h"