diff options
| author | Sascha Hauer | 2008-12-18 11:51:57 +0100 |
|---|---|---|
| committer | Sascha Hauer | 2008-12-18 16:40:14 +0100 |
| commit | a2449091522990e9746a3f1420b9041d9669590c (patch) | |
| tree | e7d1f948100f2f51809399626a97a18ab7f503c5 /arch/arm/plat-mxc/include/mach/io.h | |
| parent | [ARM] MXC: do not include mach/hardware.h from mach/timex.h (diff) | |
| download | kernel-qcow2-linux-a2449091522990e9746a3f1420b9041d9669590c.tar.gz kernel-qcow2-linux-a2449091522990e9746a3f1420b9041d9669590c.tar.xz kernel-qcow2-linux-a2449091522990e9746a3f1420b9041d9669590c.zip | |
[ARM] MXC: do not include mach/hardware.h from mach/memory.h
Instead of including other header files, define PHYS_OFFSET directly
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/io.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/io.h b/arch/arm/plat-mxc/include/mach/io.h index c0cb267e7403..b4f2de769466 100644 --- a/arch/arm/plat-mxc/include/mach/io.h +++ b/arch/arm/plat-mxc/include/mach/io.h @@ -25,8 +25,8 @@ __mx3_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype) /* Access all peripherals below 0x80000000 as nonshared device * but leave l2cc alone. */ - if ((phys_addr < 0x80000000) && ((phys_addr < L2CC_BASE_ADDR) || - (phys_addr >= L2CC_BASE_ADDR + L2CC_SIZE))) + if ((phys_addr < 0x80000000) && ((phys_addr < 0x30000000) || + (phys_addr >= 0x30000000 + SZ_1M))) mtype = MT_DEVICE_NONSHARED; } |