diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-24 15:49:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-24 15:49:43 +1000 |
| commit | 60522c02f0bf48d3ddd26d7cb07cd0dc6ade41a5 (patch) | |
| tree | f33ba012db40d8d03989b0f4935c7c5e04b442c1 /drivers/rtc/Kconfig | |
| parent | cbd9cd251bd27583eb0efa570becd9bc48786c7b (diff) | |
| parent | 0023918ef225589578d9ccb0634bd9dabff568cd (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/rtc/Kconfig')
| -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 f4e113874e7a..6714b6d1ee93 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -530,11 +530,11 @@ config RTC_DRV_RV3029C2 will be called rtc-rv3029c2. config RTC_DRV_S5M - tristate "Samsung S5M series" + tristate "Samsung S2M/S5M series" depends on MFD_SEC_CORE help If you say yes here you will get support for the - RTC of Samsung S5M PMIC series. + RTC of Samsung S2MPS14 and S5M PMIC series. This driver can also be built as a module. If so, the module will be called rtc-s5m. |