On Fri, Aug 10, 2001 at 10:58:02AM -0500, Robert E Brose II wrote: > User Michel Lanners says: > > > --- 2.2.19-ide-05042001/drivers/block/ll_rw_blk.c~ Tue Aug 7 > > > 15:34:29 > > > 2001 > > > +++ 2.2.19-ide-05042001/drivers/block/ll_rw_blk.c Tue Aug 7 > > > 15:50:08 > > > 2001 > > > @@ -25,6 +25,7 @@ > > > #include <linux/blk.h> > > > > > > #ifdef CONFIG_POWERMAC > > > +#include <linux/ide.h> > > > #include <asm/ide.h> > > > #endif > > > > Ah, this problem.... I guess every single kernel file had this problem > > at one time or another.... You can probably remove the #include > > <asm/ide.h>, since <linux/ide.h> includes that itself. > > > > > Error Message: > > > In file included from ppc_ksyms.c:15: > > > /usr/src/lk2.2/2.2.19-ide-05042001/include/asm/ide.h:53: parse error > > > before *' > > > /usr/src/lk2.2/2.2.19-ide-05042001/include/asm/ide.h:56: warning: function > > > declaration isn't a prototype > > > /usr/src/lk2.2/2.2.19-ide-05042001/include/asm/ide.h:63: parse error > > > before *' > > > /usr/src/lk2.2/2.2.19-ide-05042001/include/asm/ide.h:63: warning: function > > > declaration isn't a prototype > > > make[1]: *** [ppc_ksyms.o] Error 1 > > > make[1]: Leaving directory > > > /usr/src/lk2.2/2.2.19-ide-05042001/arch/ppc/kernel' > > > make: *** [_dir_arch/ppc/kernel] Error 2 > > > > Have a look at include/asm/ide.h, lines 53 and 63. There is a type used > > there that isn't defined in the PPC include files. Copy the definition > > from the i386 files. > > > > Bob had the same problem; he may still know what he had to change. Bob? > > > I'm pretty sure that just changing the include from asm/ide.h to > linux/ide.h did it for me. linux/ide.h includes asm/ide.h anyway (and > defines the hw_regs_t what was missing for asm/ide.h) > > Bob
Ok, so in other words the diff will change to: --- 2.2.19-ide-05042001/drivers/block/ll_rw_blk.c~ Tue Aug 7 15:34:29 2001 +++ 2.2.19-ide-05042001/drivers/block/ll_rw_blk.c Tue Aug 7 15:50:08 2001 @@ -25,6 +25,7 @@ #include <linux/blk.h> #ifdef CONFIG_POWERMAC -#include <asm/ide.h> +#include <linux/ide.h> #endif Is that right?