mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts: arch/arm/mach-s3c24xx/include/mach/system.h
This commit is contained in:
commit
880bcd4a83
152 changed files with 700 additions and 864 deletions
|
|
@ -748,7 +748,7 @@ config HAVE_S3C_RTC
|
|||
|
||||
config RTC_DRV_S3C
|
||||
tristate "Samsung S3C series SoC RTC"
|
||||
depends on ARCH_S3C2410 || ARCH_S3C64XX || HAVE_S3C_RTC
|
||||
depends on ARCH_S3C64XX || HAVE_S3C_RTC
|
||||
help
|
||||
RTC (Realtime Clock) driver for the clock inbuilt into the
|
||||
Samsung S3C24XX series of SoCs. This can provide periodic
|
||||
|
|
|
|||
Loading…
Reference in a new issue