diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/mach-s5p6440/include/mach/map.h | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-s5p6440/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-s5p6440/include/mach/map.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p6440/include/mach/map.h b/arch/arm/mach-s5p6440/include/mach/map.h index 44011b91fbd1..6cc5cbc88ffb 100644 --- a/arch/arm/mach-s5p6440/include/mach/map.h +++ b/arch/arm/mach-s5p6440/include/mach/map.h | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #define S5P_PA_TIMER S5P6440_PA_TIMER | 38 | #define S5P_PA_TIMER S5P6440_PA_TIMER |
| 39 | 39 | ||
| 40 | #define S5P6440_PA_RTC (0xEA100000) | 40 | #define S5P6440_PA_RTC (0xEA100000) |
| 41 | #define S5P_PA_RTC S5P6440_PA_RTC | ||
| 42 | 41 | ||
| 43 | #define S5P6440_PA_WDT (0xEA200000) | 42 | #define S5P6440_PA_WDT (0xEA200000) |
| 44 | #define S5P_PA_WDT S5P6440_PA_WDT | 43 | #define S5P_PA_WDT S5P6440_PA_WDT |
| @@ -53,6 +52,7 @@ | |||
| 53 | #define S5P_SZ_UART SZ_256 | 52 | #define S5P_SZ_UART SZ_256 |
| 54 | 53 | ||
| 55 | #define S5P6440_PA_IIC0 (0xEC104000) | 54 | #define S5P6440_PA_IIC0 (0xEC104000) |
| 55 | #define S5P6440_PA_IIC1 (0xEC20F000) | ||
| 56 | 56 | ||
| 57 | #define S5P6440_PA_SPI0 0xEC400000 | 57 | #define S5P6440_PA_SPI0 0xEC400000 |
| 58 | #define S5P6440_PA_SPI1 0xEC500000 | 58 | #define S5P6440_PA_SPI1 0xEC500000 |
| @@ -77,6 +77,8 @@ | |||
| 77 | /* compatibiltiy defines. */ | 77 | /* compatibiltiy defines. */ |
| 78 | #define S3C_PA_UART S5P6440_PA_UART | 78 | #define S3C_PA_UART S5P6440_PA_UART |
| 79 | #define S3C_PA_IIC S5P6440_PA_IIC0 | 79 | #define S3C_PA_IIC S5P6440_PA_IIC0 |
| 80 | #define S3C_PA_RTC S5P6440_PA_RTC | ||
| 81 | #define S3C_PA_IIC1 S5P6440_PA_IIC1 | ||
| 80 | #define S3C_PA_WDT S5P6440_PA_WDT | 82 | #define S3C_PA_WDT S5P6440_PA_WDT |
| 81 | 83 | ||
| 82 | #define SAMSUNG_PA_ADC S5P6440_PA_ADC | 84 | #define SAMSUNG_PA_ADC S5P6440_PA_ADC |