diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-17 11:21:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-17 11:21:20 -0400 |
| commit | 47239561e39bceefecc3cd67f71fcf86a198a8ff (patch) | |
| tree | 9823d0973494ea8acabb744bc3aba42b610fb434 /drivers/rtc/Kconfig | |
| parent | ed681a91ab805341675d166a9592551093c0a2d9 (diff) | |
| parent | 5bee17f18b595937e6beafeee5197868a3f74a06 (diff) | |
Merge branch 'linus' into core/printk
Diffstat (limited to 'drivers/rtc/Kconfig')
| -rw-r--r-- | drivers/rtc/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index cced4d108319..81450fbd8b12 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
| @@ -241,6 +241,12 @@ config RTC_DRV_M41T80_WDT | |||
| 241 | If you say Y here you will get support for the | 241 | If you say Y here you will get support for the |
| 242 | watchdog timer in the ST M41T60 and M41T80 RTC chips series. | 242 | watchdog timer in the ST M41T60 and M41T80 RTC chips series. |
| 243 | 243 | ||
| 244 | config RTC_DRV_DM355EVM | ||
| 245 | tristate "TI DaVinci DM355 EVM RTC" | ||
| 246 | depends on MFD_DM355EVM_MSP | ||
| 247 | help | ||
| 248 | Supports the RTC firmware in the MSP430 on the DM355 EVM. | ||
| 249 | |||
| 244 | config RTC_DRV_TWL92330 | 250 | config RTC_DRV_TWL92330 |
| 245 | boolean "TI TWL92330/Menelaus" | 251 | boolean "TI TWL92330/Menelaus" |
| 246 | depends on MENELAUS | 252 | depends on MENELAUS |