diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:07:25 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:07:25 +0900 |
| commit | 14b8a0f92b309ff452a8c339abd9a096d00b210f (patch) | |
| tree | 0472637882c576873aae00207a07f9d178cdebd7 /arch/arm/mach-s3c64xx/include/mach/map.h | |
| parent | 05a690d2db5bd57d3c94293b06b69158535835df (diff) | |
| parent | adc0950c08e1f433f6933759f4facf9b2cf8d29d (diff) | |
| download | kernel_samsung_smdk4412-14b8a0f92b309ff452a8c339abd9a096d00b210f.zip kernel_samsung_smdk4412-14b8a0f92b309ff452a8c339abd9a096d00b210f.tar.gz kernel_samsung_smdk4412-14b8a0f92b309ff452a8c339abd9a096d00b210f.tar.bz2 | |
ARM: Merge for-2635/samsung-rtc
Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2
Conflicts:
arch/arm/mach-s3c64xx/include/mach/map.h
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
Diffstat (limited to 'arch/arm/mach-s3c64xx/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/map.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h index 869c8e0..9fdd50c 100644 --- a/arch/arm/mach-s3c64xx/include/mach/map.h +++ b/arch/arm/mach-s3c64xx/include/mach/map.h @@ -103,6 +103,8 @@ #define S3C_PA_USBHOST S3C64XX_PA_USBHOST #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG #define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY +#define S3C_PA_RTC S3C64XX_PA_RTC + #define SAMSUNG_PA_ADC S3C64XX_PA_ADC #endif /* __ASM_ARCH_6400_MAP_H */ |