diff options
| author |   Sylvain Munaut <tnt@246tNt.com> | 2006-11-11 10:53:19 +0100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-11-13 14:49:25 +1100 |
| commit | 19a79859e168640f8e16d7b216d211c1c52b687a (patch) | |
| tree | 6a7d0467b26bd1470679b486899c48258a611b73 /include/asm-ppc/io.h | |
| parent | [PATCH] Make git ignore new wrapper generated files (diff) | |
| download | linux-dev-19a79859e168640f8e16d7b216d211c1c52b687a.tar.xz linux-dev-19a79859e168640f8e16d7b216d211c1c52b687a.zip | |
[PATCH] ppc: Fix io.h for config with CONFIG_PCI not set
When CONFIG_PCI option is not set, the variables
pci_dram_offset, isa_io_base and isa_mem_base are not defined.
Currently, the test is handled in each platform header. This
patch moves the test in io.h once and for all.
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc/io.h')
| -rw-r--r-- | include/asm-ppc/io.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index a4c411b753ef..b744baf9e206 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h @@ -26,17 +26,11 @@ #if defined(CONFIG_4xx) #include <asm/ibm4xx.h> -#elif defined(CONFIG_PPC_MPC52xx) -#include <asm/mpc52xx.h> #elif defined(CONFIG_8xx) #include <asm/mpc8xx.h> #elif defined(CONFIG_8260) #include <asm/mpc8260.h> -#elif defined(CONFIG_83xx) -#include <asm/mpc83xx.h> -#elif defined(CONFIG_85xx) -#include <asm/mpc85xx.h> -#elif defined(CONFIG_APUS) +#elif defined(CONFIG_APUS) || !defined(CONFIG_PCI) #define _IO_BASE 0 #define _ISA_MEM_BASE 0 #define PCI_DRAM_OFFSET 0 |