diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 00:49:59 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 00:49:59 -0300 |
commit | b43056538f7130806ba9424c3741e7654df7b64f (patch) | |
tree | 4f048b4ca41b0e195bf0af674b40b706fec2519b /linux/arch/arm/plat-mxc/include/mach | |
parent | a5566bda8f87f8a8d847fc44d0886a77d5e90cae (diff) | |
download | mediapointer-dvb-s2-b43056538f7130806ba9424c3741e7654df7b64f.tar.gz mediapointer-dvb-s2-b43056538f7130806ba9424c3741e7654df7b64f.tar.bz2 |
backport changes at arch/arm and mmc
From: Mauro Carvalho Chehab <mchehab@redhat.com>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/arch/arm/plat-mxc/include/mach')
-rw-r--r-- | linux/arch/arm/plat-mxc/include/mach/memory.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/arch/arm/plat-mxc/include/mach/memory.h b/linux/arch/arm/plat-mxc/include/mach/memory.h index 6065e0017..d3afafdcc 100644 --- a/linux/arch/arm/plat-mxc/include/mach/memory.h +++ b/linux/arch/arm/plat-mxc/include/mach/memory.h @@ -22,6 +22,10 @@ #endif #elif defined CONFIG_ARCH_MX3 #define PHYS_OFFSET UL(0x80000000) +#elif defined CONFIG_ARCH_MX25 +#define PHYS_OFFSET UL(0x80000000) +#elif defined CONFIG_ARCH_MXC91231 +#define PHYS_OFFSET UL(0x90000000) #endif #if defined(CONFIG_MX1_VIDEO) |