diff options
author | Sylvain Munaut <tnt@246tNt.com> | 2006-01-06 03:11:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:31 -0500 |
commit | f80257a25d9f73a0e6e377c7d6bf29b8938c042d (patch) | |
tree | e44b01971bafb813785c8c55e75b2a29f31b804d /include | |
parent | 041cb6241fa97c4881dd19d79f783b2e077acd28 (diff) |
[PATCH] ppc32: Allows compilation of a MPC52xx kernel without PCI
Some custom cards might not need PCI, without this patch, compilation fails.
Signed-off-by: Roger Blofeld <blofeldus@yahoo.com>
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-ppc/io.h | 2 | ||||
-rw-r--r-- | include/asm-ppc/mpc52xx.h | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index 84ac6e258eef..df9cf6ed189d 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h | |||
@@ -27,6 +27,8 @@ | |||
27 | 27 | ||
28 | #if defined(CONFIG_4xx) | 28 | #if defined(CONFIG_4xx) |
29 | #include <asm/ibm4xx.h> | 29 | #include <asm/ibm4xx.h> |
30 | #elif defined(CONFIG_PPC_MPC52xx) | ||
31 | #include <asm/mpc52xx.h> | ||
30 | #elif defined(CONFIG_8xx) | 32 | #elif defined(CONFIG_8xx) |
31 | #include <asm/mpc8xx.h> | 33 | #include <asm/mpc8xx.h> |
32 | #elif defined(CONFIG_8260) | 34 | #elif defined(CONFIG_8260) |
diff --git a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h index 04d56301345b..a055e0756b9d 100644 --- a/include/asm-ppc/mpc52xx.h +++ b/include/asm-ppc/mpc52xx.h | |||
@@ -29,6 +29,17 @@ struct pt_regs; | |||
29 | #endif /* __ASSEMBLY__ */ | 29 | #endif /* __ASSEMBLY__ */ |
30 | 30 | ||
31 | 31 | ||
32 | #ifdef CONFIG_PCI | ||
33 | #define _IO_BASE isa_io_base | ||
34 | #define _ISA_MEM_BASE isa_mem_base | ||
35 | #define PCI_DRAM_OFFSET pci_dram_offset | ||
36 | #else | ||
37 | #define _IO_BASE 0 | ||
38 | #define _ISA_MEM_BASE 0 | ||
39 | #define PCI_DRAM_OFFSET 0 | ||
40 | #endif | ||
41 | |||
42 | |||
32 | /* ======================================================================== */ | 43 | /* ======================================================================== */ |
33 | /* PPC Sys devices definition */ | 44 | /* PPC Sys devices definition */ |
34 | /* ======================================================================== */ | 45 | /* ======================================================================== */ |