diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-27 19:03:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-27 19:03:32 -0400 |
| commit | d61b7a572b292e2be409e13b4b3adf475f18fb29 (patch) | |
| tree | e9d30390860147136c05e66abf1edda1bc5b0562 /drivers/rtc/Kconfig | |
| parent | 18d9946bc7e2252fe3c0f2f609ac383c627edefd (diff) | |
| parent | f4e2467bad53023589cbff18dd1ab6e0aa3f004c (diff) | |
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull "ARM: global cleanups" from Arnd Bergmann:
"Quite a bit of code gets removed, and some stuff moved around, mostly
the old samsung s3c24xx stuff. There should be no functional changes
in this series otherwise. Some cleanups have dependencies on other
arm-soc branches and will be sent in the second round.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
Fixed up trivial conflicts mainly due to #include's being changes on
both sides.
* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits)
ep93xx: Remove unnecessary includes of ep93xx-regs.h
ep93xx: Move EP93XX_SYSCON defines to SoC private header
ep93xx: Move crunch code to mach-ep93xx directory
ep93xx: Make syscon access functions private to SoC
ep93xx: Configure GPIO ports in core code
ep93xx: Move peripheral defines to local SoC header
ep93xx: Convert the watchdog driver into a platform device.
ep93xx: Use ioremap for backlight driver
ep93xx: Move GPIO defines to gpio-ep93xx.h
ep93xx: Don't use system controller defines in audio drivers
ep93xx: Move PHYS_BASE defines to local SoC header file
ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver
ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
PM / devfreq: update the name of EXYNOS clock registers that were omitted
PM / devfreq: update the name of EXYNOS clock register
ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock
ARM: EXYNOS: use static declaration on regarding clock
ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
ARM: OMAP2+: Fix build error after merge
ARM: S3C24XX: remove call to s3c24xx_setup_clocks
...
Diffstat (limited to 'drivers/rtc/Kconfig')
| -rw-r--r-- | drivers/rtc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 4f9fb25f945b..4768a9d28375 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
| @@ -755,7 +755,7 @@ config HAVE_S3C_RTC | |||
| 755 | 755 | ||
| 756 | config RTC_DRV_S3C | 756 | config RTC_DRV_S3C |
| 757 | tristate "Samsung S3C series SoC RTC" | 757 | tristate "Samsung S3C series SoC RTC" |
| 758 | depends on ARCH_S3C2410 || ARCH_S3C64XX || HAVE_S3C_RTC | 758 | depends on ARCH_S3C64XX || HAVE_S3C_RTC |
| 759 | help | 759 | help |
| 760 | RTC (Realtime Clock) driver for the clock inbuilt into the | 760 | RTC (Realtime Clock) driver for the clock inbuilt into the |
| 761 | Samsung S3C24XX series of SoCs. This can provide periodic | 761 | Samsung S3C24XX series of SoCs. This can provide periodic |