Use menuconfig objects: RTC

Change Kconfig objects from "menu, config" into "menuconfig" so that the
user can disable the whole feature without having to enter the menu first.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Cc: David Brownell <david-b@pacbell.net>
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>

1 files changed, 31 insertions, 47 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 9ed0a98bf565..ff9e35cb308d 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -2,15 +2,13 @@
 # RTC class/drivers configuration
 #
 
-menu "Real Time Clock"
-        depends on !S390
-
 config RTC_LIB
         tristate
 
-config RTC_CLASS
-        tristate "RTC class"
+menuconfig RTC_CLASS
+        tristate "Real Time Clock"
         default n
+        depends on !S390
         select RTC_LIB
         help
           Generic RTC class support. If you say yes here, you will
@@ -20,6 +18,8 @@ config RTC_CLASS
           This driver can also be built as a module. If so, the module
           will be called rtc-class.
 
+if RTC_CLASS
+
 config RTC_HCTOSYS
         bool "Set system time from RTC on startup and resume"
         depends on RTC_CLASS = y
@@ -58,11 +58,10 @@ config RTC_DEBUG
           and individual RTC drivers.
 
 comment "RTC interfaces"
-        depends on RTC_CLASS
 
 config RTC_INTF_SYSFS
         boolean "/sys/class/rtc/rtcN (sysfs)"
-        depends on RTC_CLASS && SYSFS
+        depends on SYSFS
         default RTC_CLASS
         help
           Say yes here if you want to use your RTCs using sysfs interfaces,
@@ -73,7 +72,7 @@ config RTC_INTF_SYSFS
 
 config RTC_INTF_PROC
         boolean "/proc/driver/rtc (procfs for rtc0)"
-        depends on RTC_CLASS && PROC_FS
+        depends on PROC_FS
         default RTC_CLASS
         help
           Say yes here if you want to use your first RTC through the proc
@@ -85,7 +84,6 @@ config RTC_INTF_PROC
 
 config RTC_INTF_DEV
         boolean "/dev/rtcN (character devices)"
-        depends on RTC_CLASS
         default RTC_CLASS
         help
           Say yes here if you want to use your RTCs using the /dev
@@ -107,7 +105,6 @@ config RTC_INTF_DEV_UIE_EMUL
 
 config RTC_DRV_TEST
         tristate "Test driver/device"
-        depends on RTC_CLASS
         help
           If you say yes here you get support for the
           RTC test driver. It's a software RTC which can be
@@ -121,11 +118,12 @@ config RTC_DRV_TEST
           will be called rtc-test.
 
 comment "I2C RTC drivers"
-        depends on RTC_CLASS && I2C
+        depends on I2C
+
+if I2C
 
 config RTC_DRV_DS1307
         tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for various compatible RTC
           chips (often with battery backup) connected with I2C.  This driver
@@ -143,7 +141,6 @@ config RTC_DRV_DS1307
 
 config RTC_DRV_DS1672
         tristate "Dallas/Maxim DS1672"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
           Dallas/Maxim DS1672 timekeeping chip.
@@ -153,7 +150,6 @@ config RTC_DRV_DS1672
 
 config RTC_DRV_MAX6900
         tristate "Maxim 6900"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you will get support for the
           Maxim MAX6900 I2C RTC chip.
@@ -163,7 +159,6 @@ config RTC_DRV_MAX6900
 
 config RTC_DRV_RS5C372
         tristate "Ricoh RS5C372A/B, RV5C386, RV5C387A"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
           Ricoh RS5C372A, RS5C372B, RV5C386, and RV5C387A RTC chips.
@@ -173,7 +168,6 @@ config RTC_DRV_RS5C372
 
 config RTC_DRV_ISL1208
         tristate "Intersil 1208"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
           Intersil 1208 RTC chip.
@@ -183,7 +177,6 @@ config RTC_DRV_ISL1208
 
 config RTC_DRV_X1205
         tristate "Xicor/Intersil X1205"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
           Xicor/Intersil X1205 RTC chip.
@@ -193,7 +186,6 @@ config RTC_DRV_X1205
 
 config RTC_DRV_PCF8563
         tristate "Philips PCF8563/Epson RTC8564"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
           Philips PCF8563 RTC chip. The Epson RTC8564
@@ -204,7 +196,6 @@ config RTC_DRV_PCF8563
 
 config RTC_DRV_PCF8583
         tristate "Philips PCF8583"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the Philips PCF8583
           RTC chip found on Acorn RiscPCs. This driver supports the
@@ -217,7 +208,6 @@ config RTC_DRV_PCF8583
 
 config RTC_DRV_M41T80
         tristate "ST M41T80 series RTC"
-        depends on RTC_CLASS && I2C
         help
           If you say Y here you will get support for the
           ST M41T80 RTC chips series. Currently following chips are
@@ -236,19 +226,21 @@ config RTC_DRV_M41T80_WDT
 
 config RTC_DRV_TWL92330
         boolean "TI TWL92330/Menelaus"
-        depends on RTC_CLASS && I2C && MENELAUS
+        depends on MENELAUS
         help
           If you say yes here you get support for the RTC on the
           TWL92330 "Menelaus" power mangement chip, used with OMAP2
           platforms.  The support is integrated with the rest of
           the Menelaus driver; it's not separate module.