diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/control.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h index c98c7591f3b8..2f494b6a9d0a 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap.h | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | 55 | ||
| 56 | #include "msm_iomap-8960.h" | 56 | #include "msm_iomap-8960.h" |
| 57 | 57 | ||
| 58 | /* Virtual addressses shared across all MSM targets. */ | 58 | /* Virtual addresses shared across all MSM targets. */ |
| 59 | #define MSM_CSR_BASE IOMEM(0xE0001000) | 59 | #define MSM_CSR_BASE IOMEM(0xE0001000) |
| 60 | #define MSM_QGIC_DIST_BASE IOMEM(0xF0000000) | 60 | #define MSM_QGIC_DIST_BASE IOMEM(0xF0000000) |
| 61 | #define MSM_QGIC_CPU_BASE IOMEM(0xF0001000) | 61 | #define MSM_QGIC_CPU_BASE IOMEM(0xF0001000) |
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index c2804c1c4efd..a016c8b59e00 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h | |||
| @@ -236,7 +236,7 @@ | |||
| 236 | #define OMAP343X_CONTROL_WKUP_DEBOBS3 (OMAP343X_CONTROL_GENERAL_WKUP + 0x014) | 236 | #define OMAP343X_CONTROL_WKUP_DEBOBS3 (OMAP343X_CONTROL_GENERAL_WKUP + 0x014) |
| 237 | #define OMAP343X_CONTROL_WKUP_DEBOBS4 (OMAP343X_CONTROL_GENERAL_WKUP + 0x018) | 237 | #define OMAP343X_CONTROL_WKUP_DEBOBS4 (OMAP343X_CONTROL_GENERAL_WKUP + 0x018) |
| 238 | 238 | ||
| 239 | /* 36xx-only RTA - Retention till Accesss control registers and bits */ | 239 | /* 36xx-only RTA - Retention till Access control registers and bits */ |
| 240 | #define OMAP36XX_CONTROL_MEM_RTA_CTRL 0x40C | 240 | #define OMAP36XX_CONTROL_MEM_RTA_CTRL 0x40C |
| 241 | #define OMAP36XX_RTA_DISABLE 0x0 | 241 | #define OMAP36XX_RTA_DISABLE 0x0 |
| 242 | 242 | ||