aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-08-08 17:20:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 18:57:19 -0400
commitad0200f72d9875caa2023c59240ee677df66918e (patch)
tree6fe0f2e984024fe9233e4f414a5b4797fec1c170 /drivers
parent571eb88390182b0439f72326bb18aa10ebef5d88 (diff)
drivers/rtc/Kconfig: move DS2404 entry where it belongs
Move the DS2404 entry together with the other Dallas entries, and add Maxim so that it looks nicer (and more correct, too.) Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: Sven Schnelle <svens@stackframe.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rtc/Kconfig18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 0754f5c7cb3b..2d99bf60db2f 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -760,6 +760,15 @@ config RTC_DRV_DS1742
760 This driver can also be built as a module. If so, the module 760 This driver can also be built as a module. If so, the module
761 will be called rtc-ds1742. 761 will be called rtc-ds1742.
762 762
763config RTC_DRV_DS2404
764 tristate "Maxim/Dallas DS2404"
765 help
766 If you say yes here you get support for the
767 Dallas DS2404 RTC chip.
768
769 This driver can also be built as a module. If so, the module
770 will be called rtc-ds2404.
771
763config RTC_DRV_DA9052 772config RTC_DRV_DA9052
764 tristate "Dialog DA9052/DA9053 RTC" 773 tristate "Dialog DA9052/DA9053 RTC"
765 depends on PMIC_DA9052 774 depends on PMIC_DA9052
@@ -873,15 +882,6 @@ config RTC_DRV_V3020
873 This driver can also be built as a module. If so, the module 882 This driver can also be built as a module. If so, the module
874 will be called rtc-v3020. 883 will be called rtc-v3020.
875 884
876config RTC_DRV_DS2404
877 tristate "Dallas DS2404"
878 help
879 If you say yes here you get support for the
880 Dallas DS2404 RTC chip.
881
882 This driver can also be built as a module. If so, the module
883 will be called rtc-ds2404.
884
885config RTC_DRV_WM831X 885config RTC_DRV_WM831X
886 tristate "Wolfson Microelectronics WM831x RTC" 886 tristate "Wolfson Microelectronics WM831x RTC"
887 depends on MFD_WM831X 887 depends on MFD_WM831X