diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:20:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:20:15 -0700 |
| commit | 36ec891895020f3bc9953c8b11d079c6d77d76bd (patch) | |
| tree | 89961ee93d8bf5f4e924c2e02790ddd52d61da5c /drivers | |
| parent | 70740d6c93030b339b4ad17fd58ee135dfc13913 (diff) | |
| parent | e4b41dbd60e30463cc8fab21ed45b7d6227fc338 (diff) | |
| download | linux-3.10-36ec891895020f3bc9953c8b11d079c6d77d76bd.tar.gz linux-3.10-36ec891895020f3bc9953c8b11d079c6d77d76bd.tar.bz2 linux-3.10-36ec891895020f3bc9953c8b11d079c6d77d76bd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
sh: asm/gpio.h needs linux/kernel.h for might_sleep()/WARN_ON().
sh: mach-highlander: Handle SCIF pinmuxing on R7785RP.
sh: sh7785 pinmux support
sh: update defconfigs.
sh: Kill off unused p1fc divisors from SH7763 clk fwk.
sh: improve pinmux support for single direction pins
sh: use 10MHz VIO_CLK for ov772x on Migo-R
sh: Update gpio_set_value() pin value handling
sh: update ov772x byte order on Migo-R
rtc: Add R2025S/D comment to rs5c372 Kconfig entry.
sh: Export cache flush routines needed by sh_eth on SH7619.
sh: Wire up oops reporting in the die notifier chain.
sh: ap325rxa: Kill off unused port definitions.
sh: Hook up PB0->PB7 input-only pins in SH7203 PFC.
sh: ap325rxa: Move off of hardcoded pinmux for flctl initialization.
sh: add support FLCTL for ap325rxa board
sh: gpio: Stub in dummy GPIO<->IRQ mapping routines.
sh: rsk7203: leds-gpio support for RSK+ LEDs.
sh: gpio: Include asm-generic/gpio.h for non-gpiolib stubs.
sh: fix soc-camera compile breakage on Migo-R.
...
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 847481dc8d7..8abbb2020af 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -171,10 +171,10 @@ config RTC_DRV_MAX6900 will be called rtc-max6900. config RTC_DRV_RS5C372 - tristate "Ricoh RS5C372A/B, RV5C386, RV5C387A" + tristate "Ricoh R2025S/D, RS5C372A/B, RV5C386, RV5C387A" help If you say yes here you get support for the - Ricoh RS5C372A, RS5C372B, RV5C386, and RV5C387A RTC chips. + Ricoh R2025S/D, RS5C372A, RS5C372B, RV5C386, and RV5C387A RTC chips. This driver can also be built as a module. If so, the module will be called rtc-rs5c372. |