xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: Merge for-2635/samsung-rtc

Browse Source 
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
This commit is contained in:
Ben Dooks
2010-05-19 18:07:25 +09:00
parent 05a690d2db adc0950c08
commit 14b8a0f92b
5 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-s3c64xx/include/mach/map.h
View File

@@ -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 */