diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/rtc/Kconfig | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/rtc/Kconfig')
| -rw-r--r-- | drivers/rtc/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index bccff400b198..f2fc81a9074d 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
| @@ -162,6 +162,16 @@ config RTC_DRV_PCF8583 | |||
| 162 | This driver can also be built as a module. If so, the module | 162 | This driver can also be built as a module. If so, the module |
| 163 | will be called rtc-pcf8583. | 163 | will be called rtc-pcf8583. |
| 164 | 164 | ||
| 165 | config RTC_DRV_RS5C348 | ||
| 166 | tristate "Ricoh RS5C348A/B" | ||
| 167 | depends on RTC_CLASS && SPI | ||
| 168 | help | ||
| 169 | If you say yes here you get support for the | ||
| 170 | Ricoh RS5C348A and RS5C348B RTC chips. | ||
| 171 | |||
| 172 | This driver can also be built as a module. If so, the module | ||
| 173 | will be called rtc-rs5c348. | ||
| 174 | |||
| 165 | config RTC_DRV_RS5C372 | 175 | config RTC_DRV_RS5C372 |
| 166 | tristate "Ricoh RS5C372A/B" | 176 | tristate "Ricoh RS5C372A/B" |
| 167 | depends on RTC_CLASS && I2C | 177 | depends on RTC_CLASS && I2C |