[patch 5/9] kill isa_{io,mem}_base definitions for !PCI

[Kumar Gala]

On Jun 15, 2007, at 7:05 PM, arnd at arndb.de wrote:

> When CONFIG_PCI is disabled, the definitions for isa_io_base,
> isa_mem_base and pci_dram_offset are entirely unused, but they
> can result in link failure because they are defined in multiple
> places.
>
> The easiest fix is to just remove all these definitions.
>
> Signed-off-by: Arnd Bergmann <arnd at arndb.de>

[snip]


> Index: linux-2.6/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
> ===================================================================
> --- linux-2.6.orig/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
> +++ linux-2.6/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
> @@ -54,12 +54,6 @@
>
>  #define MPC7448HPC2_PCI_CFG_PHYS 0xfb000000
>
> -#ifndef CONFIG_PCI
> -isa_io_base = MPC7448_HPC2_ISA_IO_BASE;
> -isa_mem_base = MPC7448_HPC2_ISA_MEM_BASE;
> -pci_dram_offset = MPC7448_HPC2_PCI_MEM_OFFSET;
> -#endif
> -
>  extern void _nmask_and_or_msr(unsigned long nmask, unsigned long  
> or_val);

can you remove the defines in mpc7448_hpc2.h since they are appear to  
only be used here.

[snip]

- k