diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:42:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:42:01 -0400 |
| commit | fc851fad00d7fa1bf4ac7034d9ba8041bf482d50 (patch) | |
| tree | 779a8b572d1701ef2c46755df751d9275650cdf4 /include/asm-powerpc/mpc86xx.h | |
| parent | 85cd7251b9112e3dabeac9fd3b175601ca607241 (diff) | |
| parent | f9bcda7760e1373615c9f6d9ce24209b0ab97de1 (diff) | |
Merge branch 'upstream' into pata-drivers
Diffstat (limited to 'include/asm-powerpc/mpc86xx.h')
| -rw-r--r-- | include/asm-powerpc/mpc86xx.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-powerpc/mpc86xx.h b/include/asm-powerpc/mpc86xx.h index f260382739fa..b85df45b1a84 100644 --- a/include/asm-powerpc/mpc86xx.h +++ b/include/asm-powerpc/mpc86xx.h | |||
| @@ -23,8 +23,6 @@ | |||
| 23 | #define _ISA_MEM_BASE isa_mem_base | 23 | #define _ISA_MEM_BASE isa_mem_base |
| 24 | #ifdef CONFIG_PCI | 24 | #ifdef CONFIG_PCI |
| 25 | #define PCI_DRAM_OFFSET pci_dram_offset | 25 | #define PCI_DRAM_OFFSET pci_dram_offset |
| 26 | #else | ||
| 27 | #define PCI_DRAM_OFFSET 0 | ||
| 28 | #endif | 26 | #endif |
| 29 | 27 | ||
| 30 | #define CPU0_BOOT_RELEASE 0x01000000 | 28 | #define CPU0_BOOT_RELEASE 0x01000000 |
| @@ -33,7 +31,6 @@ | |||
| 33 | #define MCM_PORT_CONFIG_OFFSET 0x1010 | 31 | #define MCM_PORT_CONFIG_OFFSET 0x1010 |
| 34 | 32 | ||
| 35 | /* Offset from CCSRBAR */ | 33 | /* Offset from CCSRBAR */ |
| 36 | #define MPC86xx_OPENPIC_OFFSET (0x40000) | ||
| 37 | #define MPC86xx_MCM_OFFSET (0x00000) | 34 | #define MPC86xx_MCM_OFFSET (0x00000) |
| 38 | #define MPC86xx_MCM_SIZE (0x02000) | 35 | #define MPC86xx_MCM_SIZE (0x02000) |
| 39 | 36 | ||