diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 22:03:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 22:03:06 -0400 |
| commit | 16d8775700f1815076f879719ce14b33f50a3171 (patch) | |
| tree | 8525e6e6f12b6acf7cf2746853cc65549f3dbf4c /arch/arm/plat-mxc/include/mach/memory.h | |
| parent | e34551339a195aa548eaf698523714a8fe7f1984 (diff) | |
| parent | 05e34754518b6a90d5c392790c032575fab12d66 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (91 commits)
ARM: 6806/1: irq: introduce entry and exit functions for chained handlers
ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas
ARM: 6747/1: P2V: Thumb2 support
ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump
ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode
ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9
ARM: 6772/1: errata: possible fault MMU translations following an ASID switch
ARM: 6776/1: mach-ux500: activate fix for errata 753970
ARM: 6794/1: SPEAr: Append UL to device address macros.
ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files
ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros
ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code
ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry
ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci
ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h
ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files.
ARM: 6681/1: SPEAr: add debugfs support to clk API
ARM: 6703/1: SPEAr: update clk API support
ARM: 6679/1: SPEAr: make clk API functions more generic
ARM: 6737/1: SPEAr: formalized timer support
...
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/memory.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index 83861408133f..5d51cbb98893 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h | |||
| @@ -23,23 +23,23 @@ | |||
| 23 | 23 | ||
| 24 | #if !defined(CONFIG_RUNTIME_PHYS_OFFSET) | 24 | #if !defined(CONFIG_RUNTIME_PHYS_OFFSET) |
| 25 | # if defined CONFIG_ARCH_MX1 | 25 | # if defined CONFIG_ARCH_MX1 |
| 26 | # define PHYS_OFFSET MX1_PHYS_OFFSET | 26 | # define PLAT_PHYS_OFFSET MX1_PHYS_OFFSET |
| 27 | # elif defined CONFIG_MACH_MX21 | 27 | # elif defined CONFIG_MACH_MX21 |
| 28 | # define PHYS_OFFSET MX21_PHYS_OFFSET | 28 | # define PLAT_PHYS_OFFSET MX21_PHYS_OFFSET |
| 29 | # elif defined CONFIG_ARCH_MX25 | 29 | # elif defined CONFIG_ARCH_MX25 |
| 30 | # define PHYS_OFFSET MX25_PHYS_OFFSET | 30 | # define PLAT_PHYS_OFFSET MX25_PHYS_OFFSET |
| 31 | # elif defined CONFIG_MACH_MX27 | 31 | # elif defined CONFIG_MACH_MX27 |
| 32 | # define PHYS_OFFSET MX27_PHYS_OFFSET | 32 | # define PLAT_PHYS_OFFSET MX27_PHYS_OFFSET |
| 33 | # elif defined CONFIG_ARCH_MX3 | 33 | # elif defined CONFIG_ARCH_MX3 |
| 34 | # define PHYS_OFFSET MX3x_PHYS_OFFSET | 34 | # define PLAT_PHYS_OFFSET MX3x_PHYS_OFFSET |
| 35 | # elif defined CONFIG_ARCH_MXC91231 | 35 | # elif defined CONFIG_ARCH_MXC91231 |
| 36 | # define PHYS_OFFSET MXC91231_PHYS_OFFSET | 36 | # define PLAT_PHYS_OFFSET MXC91231_PHYS_OFFSET |
| 37 | # elif defined CONFIG_ARCH_MX50 | 37 | # elif defined CONFIG_ARCH_MX50 |
| 38 | # define PHYS_OFFSET MX50_PHYS_OFFSET | 38 | # define PLAT_PHYS_OFFSET MX50_PHYS_OFFSET |
| 39 | # elif defined CONFIG_ARCH_MX51 | 39 | # elif defined CONFIG_ARCH_MX51 |
| 40 | # define PHYS_OFFSET MX51_PHYS_OFFSET | 40 | # define PLAT_PHYS_OFFSET MX51_PHYS_OFFSET |
| 41 | # elif defined CONFIG_ARCH_MX53 | 41 | # elif defined CONFIG_ARCH_MX53 |
| 42 | # define PHYS_OFFSET MX53_PHYS_OFFSET | 42 | # define PLAT_PHYS_OFFSET MX53_PHYS_OFFSET |
| 43 | # endif | 43 | # endif |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||