The IDE header file uses type definitions that are undefined if the CONFIG_BLOCK is deselected. This causes a compilation failure in setup_32.c.
Signed-off-by: Scott Wood <[EMAIL PROTECTED]> --- arch/powerpc/kernel/ppc_ksyms.c | 2 ++ arch/powerpc/kernel/setup_32.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index a20f195..bc54493 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c @@ -12,7 +12,9 @@ #include <linux/irq.h> #include <linux/pci.h> #include <linux/delay.h> +#ifdef CONFIG_BLOCK #include <linux/ide.h> +#endif #include <linux/bitops.h> #include <asm/page.h> diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 7ec6ba5..ae5d60e 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -10,7 +10,6 @@ #include <linux/reboot.h> #include <linux/delay.h> #include <linux/initrd.h> -#include <linux/ide.h> #include <linux/tty.h> #include <linux/bootmem.h> #include <linux/seq_file.h> @@ -51,7 +50,10 @@ extern void bootx_init(unsigned long r4, unsigned long phys); +#ifdef COFNIG_BLOCK +#include <linux/ide.h> struct ide_machdep_calls ppc_ide_md; +#endif int boot_cpuid; EXPORT_SYMBOL_GPL(boot_cpuid); -- 1.5.0.3 _______________________________________________ Linuxppc-dev mailing list [email protected] https://ozlabs.org/mailman/listinfo/linuxppc-dev
