diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-06 02:00:48 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-06 02:00:48 -0500 |
| commit | 02cee68998010c4a2cc2383c86babc2ecc737183 (patch) | |
| tree | 13c6483472f672c3b2570b075ed2ad4fd4c5405e /arch/arm/mach-ep93xx/include/mach/memory.h | |
| parent | f5ba35023697e54a24487bcd822194390a333893 (diff) | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
Merge commit 'v2.6.32-rc6' into next
Diffstat (limited to 'arch/arm/mach-ep93xx/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/memory.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/memory.h b/arch/arm/mach-ep93xx/include/mach/memory.h index 925b12ea0990..554064e90307 100644 --- a/arch/arm/mach-ep93xx/include/mach/memory.h +++ b/arch/arm/mach-ep93xx/include/mach/memory.h | |||
| @@ -9,6 +9,12 @@ | |||
| 9 | #define PHYS_OFFSET UL(0x00000000) | 9 | #define PHYS_OFFSET UL(0x00000000) |
| 10 | #elif defined(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) | 10 | #elif defined(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) |
| 11 | #define PHYS_OFFSET UL(0xc0000000) | 11 | #define PHYS_OFFSET UL(0xc0000000) |
| 12 | #elif defined(CONFIG_EP93XX_SDCE1_PHYS_OFFSET) | ||
| 13 | #define PHYS_OFFSET UL(0xd0000000) | ||
| 14 | #elif defined(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) | ||
| 15 | #define PHYS_OFFSET UL(0xe0000000) | ||
| 16 | #elif defined(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET) | ||
| 17 | #define PHYS_OFFSET UL(0xf0000000) | ||
| 12 | #else | 18 | #else |
| 13 | #error "Kconfig bug: No EP93xx PHYS_OFFSET set" | 19 | #error "Kconfig bug: No EP93xx PHYS_OFFSET set" |
| 14 | #endif | 20 | #endif |