diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-05 16:19:03 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-05 16:19:03 -0500 |
commit | 0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7 (patch) | |
tree | a91d4934ac4ffda651804b30554bb6da5af572d4 /arch/arm/mach-imx/hardware.h | |
parent | f015941f6b4a7d4d90c46a65bca17f2c2c41fb89 (diff) | |
parent | f7c66dc0bf0f4ecd349c79315c87841c67e27aef (diff) |
Merge branch 'next/soc' into next/dt
Diffstat (limited to 'arch/arm/mach-imx/hardware.h')
-rw-r--r-- | arch/arm/mach-imx/hardware.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/hardware.h b/arch/arm/mach-imx/hardware.h index 3ce7fa3bd43f..911e9b31b03f 100644 --- a/arch/arm/mach-imx/hardware.h +++ b/arch/arm/mach-imx/hardware.h | |||
@@ -72,11 +72,6 @@ | |||
72 | * AVIC 0x68000000+0x100000 -> 0xf5800000+0x100000 | 72 | * AVIC 0x68000000+0x100000 -> 0xf5800000+0x100000 |
73 | * X_MEMC 0xb8000000+0x010000 -> 0xf5c00000+0x010000 | 73 | * X_MEMC 0xb8000000+0x010000 -> 0xf5c00000+0x010000 |
74 | * SPBA0 0x50000000+0x100000 -> 0xf5400000+0x100000 | 74 | * SPBA0 0x50000000+0x100000 -> 0xf5400000+0x100000 |
75 | * mx50: | ||
76 | * TZIC 0x0fffc000+0x004000 -> 0xf4bfc000+0x004000 | ||
77 | * AIPS1 0x53f00000+0x100000 -> 0xf5700000+0x100000 | ||
78 | * SPBA0 0x50000000+0x100000 -> 0xf5400000+0x100000 | ||
79 | * AIPS2 0x63f00000+0x100000 -> 0xf5300000+0x100000 | ||
80 | * mx51: | 75 | * mx51: |
81 | * TZIC 0x0fffc000+0x004000 -> 0xf4bfc000+0x004000 | 76 | * TZIC 0x0fffc000+0x004000 -> 0xf4bfc000+0x004000 |
82 | * IRAM 0x1ffe0000+0x020000 -> 0xf4fe0000+0x020000 | 77 | * IRAM 0x1ffe0000+0x020000 -> 0xf4fe0000+0x020000 |
@@ -108,7 +103,6 @@ | |||
108 | #include "mxc.h" | 103 | #include "mxc.h" |
109 | 104 | ||
110 | #include "mx6q.h" | 105 | #include "mx6q.h" |
111 | #include "mx50.h" | ||
112 | #include "mx51.h" | 106 | #include "mx51.h" |
113 | #include "mx53.h" | 107 | #include "mx53.h" |
114 | #include "mx3x.h" | 108 | #include "mx3x.h" |