diff options
| author | Sylvain Munaut <tnt@246tNt.com> | 2006-11-11 04:53:19 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-11-12 22:49:25 -0500 |
| commit | 19a79859e168640f8e16d7b216d211c1c52b687a (patch) | |
| tree | 6a7d0467b26bd1470679b486899c48258a611b73 /include/asm-ppc/io.h | |
| parent | b61c5509fe8f6c665c146ab14f960000d4a5d1a9 (diff) | |
[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 @@ | |||
| 26 | 26 | ||
| 27 | #if defined(CONFIG_4xx) | 27 | #if defined(CONFIG_4xx) |
| 28 | #include <asm/ibm4xx.h> | 28 | #include <asm/ibm4xx.h> |
| 29 | #elif defined(CONFIG_PPC_MPC52xx) | ||
| 30 | #include <asm/mpc52xx.h> | ||
| 31 | #elif defined(CONFIG_8xx) | 29 | #elif defined(CONFIG_8xx) |
| 32 | #include <asm/mpc8xx.h> | 30 | #include <asm/mpc8xx.h> |
| 33 | #elif defined(CONFIG_8260) | 31 | #elif defined(CONFIG_8260) |
| 34 | #include <asm/mpc8260.h> | 32 | #include <asm/mpc8260.h> |
| 35 | #elif defined(CONFIG_83xx) | 33 | #elif defined(CONFIG_APUS) || !defined(CONFIG_PCI) |
| 36 | #include <asm/mpc83xx.h> | ||
| 37 | #elif defined(CONFIG_85xx) | ||
| 38 | #include <asm/mpc85xx.h> | ||
| 39 | #elif defined(CONFIG_APUS) | ||
| 40 | #define _IO_BASE 0 | 34 | #define _IO_BASE 0 |
| 41 | #define _ISA_MEM_BASE 0 | 35 | #define _ISA_MEM_BASE 0 |
| 42 | #define PCI_DRAM_OFFSET 0 | 36 | #define PCI_DRAM_OFFSET 0 |