diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-18 09:35:29 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-18 09:35:29 +0900 |
| commit | 0084f27a21d36ac846cd4366289c229a7cce511b (patch) | |
| tree | b151540007af3aa260418c1519a5c69b56450025 /arch/arm/mach-s3c6400 | |
| parent | bcedfa98d97e02e95bb023ab93675dbe63c508ef (diff) | |
| parent | 71269364a8d5ea42ecc6cbc7b687e5d45cbabe0e (diff) | |
ARM: Merge next-s3c64xx
Merge branch 'next-s3c64xx' into next-samsung
Conflicts:
arch/arm/mach-s3c6400/include/mach/map.h
( ADC and RTC PA merge fixed)
Diffstat (limited to 'arch/arm/mach-s3c6400')
| -rw-r--r-- | arch/arm/mach-s3c6400/include/mach/map.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index 5a35f24fcb8..c33810ed21b 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h @@ -42,6 +42,7 @@ #define S3C64XX_PA_FB (0x77100000) #define S3C64XX_PA_USB_HSOTG (0x7C000000) #define S3C64XX_PA_WATCHDOG (0x7E004000) +#define S3C64XX_PA_RTC (0x7E005000) #define S3C64XX_PA_ADC (0x7E00B000) #define S3C64XX_PA_SYSCON (0x7E00F000) #define S3C64XX_PA_AC97 (0x7F001000) |