diff options
| -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 @@ | |||
| 27 | #include <linux/serial_reg.h> | 27 | #include <linux/serial_reg.h> |
| 28 | 28 | ||
| 29 | #include "../../iomap.h" | 29 | #include "../../iomap.h" |
| 30 | #include <mach/irammap.h> | 30 | #include "../../irammap.h" |
| 31 | 31 | ||
| 32 | .macro addruart, rp, rv, tmp | 32 | .macro addruart, rp, rv, tmp |
| 33 | adr \rp, 99f @ actual addr of 99f | 33 | 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 @@ | |||
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 29 | #include <linux/serial_reg.h> | 29 | #include <linux/serial_reg.h> |
| 30 | 30 | ||
| 31 | #include <mach/irammap.h> | ||
| 32 | |||
| 33 | #include "../../iomap.h" | 31 | #include "../../iomap.h" |
| 32 | #include "../../irammap.h" | ||
| 34 | 33 | ||
| 35 | #define BIT(x) (1 << (x)) | 34 | #define BIT(x) (1 << (x)) |
| 36 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) | 35 | #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 @@ | |||
| 22 | #include <asm/cacheflush.h> | 22 | #include <asm/cacheflush.h> |
| 23 | #include <asm/hardware/cache-l2x0.h> | 23 | #include <asm/hardware/cache-l2x0.h> |
| 24 | 24 | ||
| 25 | #include <mach/irammap.h> | ||
| 26 | |||
| 27 | #include "iomap.h" | 25 | #include "iomap.h" |
| 26 | #include "irammap.h" | ||
| 28 | #include "reset.h" | 27 | #include "reset.h" |
| 29 | #include "fuse.h" | 28 | #include "fuse.h" |
| 30 | 29 | ||
