summaryrefslogtreecommitdiff
path: root/arch/arm/mach-loki/include/mach/memory.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-03-17 22:46:58 +0300
committerGrant Likely <grant.likely@secretlab.ca>2011-03-17 22:48:06 +0300
commit2dd22997679a88874c131f6e6ffb963e6d43b3a6 (patch)
treebfe1707dda7e755b8b550c6796e2649813bcfbb9 /arch/arm/mach-loki/include/mach/memory.h
parent36885ff0e6563687e6152da6d311abbf83c0198f (diff)
parent7b7adc4a016a1decb806eb71ecab98721fa7f146 (diff)
downloadlinux-2dd22997679a88874c131f6e6ffb963e6d43b3a6.tar.xz
Merge remote-tracking branch 'origin' into spi/next
Pull in Linus' tree to pick up changes required for the langwell gpio fixes
Diffstat (limited to 'arch/arm/mach-loki/include/mach/memory.h')
-rw-r--r--arch/arm/mach-loki/include/mach/memory.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-loki/include/mach/memory.h b/arch/arm/mach-loki/include/mach/memory.h
index 2ed7e6e732c2..66366657a875 100644
--- a/arch/arm/mach-loki/include/mach/memory.h
+++ b/arch/arm/mach-loki/include/mach/memory.h
@@ -5,6 +5,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
-#define PHYS_OFFSET UL(0x00000000)
+#define PLAT_PHYS_OFFSET UL(0x00000000)
#endif