Subject: fix 'Merge 32 and 64 bits asm-powerpc/io.h' From: Benjamin Herrenschmidt Fixes a typo causing various problems mostly with PCI IO space. Change from previous version is in io.h, near the top, #ifdef CONFIG_PCI -> #ifndef CONFIG_PCI Thanks to Guennadi Liakhovetski for spotting it. Signed-off-by: Arnd Bergmann Index: linux-2.6/include/asm-powerpc/io.h =================================================================== --- linux-2.6.orig/include/asm-powerpc/io.h +++ linux-2.6/include/asm-powerpc/io.h @@ -34,7 +34,7 @@ extern int check_legacy_ioport(unsigned * bases. Most of this file only uses _IO_BASE though which we * define properly based on the platform */ -#ifdef CONFIG_PCI +#ifndef CONFIG_PCI #define _IO_BASE 0 #define _ISA_MEM_BASE 0 #define PCI_DRAM_OFFSET 0 @@ -54,7 +54,7 @@ extern unsigned long pci_io_base; extern unsigned long pci_dram_offset; #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_INDIRECT_IO) -#error CONFIG_PPC_INDIRECT_IO is not yet support on 32 bits +#error CONFIG_PPC_INDIRECT_IO is not yet supported on 32 bits #endif /*