diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-10-04 22:16:59 +0200 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-11-05 19:36:06 +0100 |
| commit | bb1de8877c960b3b3e1c8337730df970b262fd44 (patch) | |
| tree | 7335240d982fec6a0e82ae7b4bbc9942f271af83 | |
| parent | ARM: tegra: move iomap.h to mach-tegra (diff) | |
| download | linux-bb1de8877c960b3b3e1c8337730df970b262fd44.tar.xz linux-bb1de8877c960b3b3e1c8337730df970b262fd44.zip | |
ARM: tegra: move irammap.h to mach-tegra
Nothing outside mach-tegra uses this file, so there's no need for it to
be in <mach/>.
Since uncompress.h and debug-macro.S remain in include/mach, they need
to include "../../irammap.h" becaue of this change. Both these usages
will be removed shortly, when Tegra's DEBUG_LL implementation is updated
not to pass information through IRAM.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/debug-macro.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/uncompress.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/irammap.h (renamed from arch/arm/mach-tegra/include/mach/irammap.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/reset.c | 3 |
4 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/include/mach/debug-macro.S b/arch/arm/mach-tegra/include/mach/debug-macro.S index 58a7fa8493e8..44ca7b1d8b8a 100644 --- a/arch/arm/mach-tegra/include/mach/debug-macro.S +++ b/arch/arm/mach-tegra/include/mach/debug-macro.S @@ -27,7 +27,7 @@ #include <linux/serial_reg.h> #include "../../iomap.h" -#include <mach/irammap.h> +#include "../../irammap.h" .macro addruart, rp, rv, tmp adr \rp, 99f @ actual addr of 99f diff --git a/arch/arm/mach-tegra/include/mach/uncompress.h b/arch/arm/mach-tegra/include/mach/uncompress.h index 095216c4b564..27725750ca3e 100644 --- a/arch/arm/mach-tegra/include/mach/uncompress.h +++ b/arch/arm/mach-tegra/include/mach/uncompress.h @@ -28,9 +28,8 @@ #include <linux/types.h> #include <linux/serial_reg.h> -#include <mach/irammap.h> - #include "../../iomap.h" +#include "../../irammap.h" #define BIT(x) (1 << (x)) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) diff --git a/arch/arm/mach-tegra/include/mach/irammap.h b/arch/arm/mach-tegra/irammap.h index 0cbe63261854..0cbe63261854 100644 --- a/arch/arm/mach-tegra/include/mach/irammap.h +++ b/arch/arm/mach-tegra/irammap.h diff --git a/arch/arm/mach-tegra/reset.c b/arch/arm/mach-tegra/reset.c index 28e51b7803ef..e05da7d10c3b 100644 --- a/arch/arm/mach-tegra/reset.c +++ b/arch/arm/mach-tegra/reset.c @@ -22,9 +22,8 @@ #include <asm/cacheflush.h> #include <asm/hardware/cache-l2x0.h> -#include <mach/irammap.h> - #include "iomap.h" +#include "irammap.h" #include "reset.h" #include "fuse.h" |