diff options
author | Adrian Bunk <bunk@kernel.org> | 2007-09-26 14:02:52 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@neptun.(none)> | 2007-10-12 15:20:32 -0400 |
commit | 247537b9a270b52cc0375adcb0fb2605a160cba5 (patch) | |
tree | cb5b734cff9c41a138f85dd69305289f0a8ec5b5 /drivers | |
parent | 4f1127e204377cbd2a56d112d323466f668e8334 (diff) |
kconfig: syntax cleanup - drop support for "depends/requires/def_boolean"
Remove the following redundant and never or rarely used kconfig syntax:
- "def_boolean" (same as "def_bool")
- "requires" (same as "depends on")
- "depends" (same as "depends on")
This patch contains the code changes and Kconfig updates.
The shipped files are in next patch to let actual codechange stand out.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Cc: Bryan Wu <bryan.wu@analog.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/misc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/leds/Kconfig | 2 | ||||
-rw-r--r-- | drivers/telephony/Kconfig | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index d602b8fa7d46..7acc6351bb44 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig | |||
@@ -152,7 +152,7 @@ config INPUT_POWERMATE | |||
152 | 152 | ||
153 | config INPUT_YEALINK | 153 | config INPUT_YEALINK |
154 | tristate "Yealink usb-p1k voip phone" | 154 | tristate "Yealink usb-p1k voip phone" |
155 | depends EXPERIMENTAL | 155 | depends on EXPERIMENTAL |
156 | depends on USB_ARCH_HAS_HCD | 156 | depends on USB_ARCH_HAS_HCD |
157 | select USB | 157 | select USB |
158 | help | 158 | help |
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 3cb23210b912..c12bd664ea59 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
@@ -83,7 +83,7 @@ config LEDS_WRAP | |||
83 | 83 | ||
84 | config LEDS_H1940 | 84 | config LEDS_H1940 |
85 | tristate "LED Support for iPAQ H1940 device" | 85 | tristate "LED Support for iPAQ H1940 device" |
86 | depends LEDS_CLASS && ARCH_H1940 | 86 | depends on LEDS_CLASS && ARCH_H1940 |
87 | help | 87 | help |
88 | This option enables support for the LEDs on the h1940. | 88 | This option enables support for the LEDs on the h1940. |
89 | 89 | ||
diff --git a/drivers/telephony/Kconfig b/drivers/telephony/Kconfig index 5f98f673f1b6..b5f78b6ed2bd 100644 --- a/drivers/telephony/Kconfig +++ b/drivers/telephony/Kconfig | |||
@@ -19,7 +19,7 @@ if PHONE | |||
19 | 19 | ||
20 | config PHONE_IXJ | 20 | config PHONE_IXJ |
21 | tristate "QuickNet Internet LineJack/PhoneJack support" | 21 | tristate "QuickNet Internet LineJack/PhoneJack support" |
22 | depends ISA || PCI | 22 | depends on ISA || PCI |
23 | ---help--- | 23 | ---help--- |
24 | Say M if you have a telephony card manufactured by Quicknet | 24 | Say M if you have a telephony card manufactured by Quicknet |
25 | Technologies, Inc. These include the Internet PhoneJACK and | 25 | Technologies, Inc. These include the Internet PhoneJACK and |