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 | |
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>
-rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/Kconfig.debug | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 2 | ||||
-rw-r--r-- | drivers/input/misc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/leds/Kconfig | 2 | ||||
-rw-r--r-- | drivers/telephony/Kconfig | 2 | ||||
-rw-r--r-- | scripts/kconfig/zconf.gperf | 2 | ||||
-rw-r--r-- | scripts/kconfig/zconf.y | 11 |
8 files changed, 8 insertions, 21 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index b24f4535ffe0..aa9db3073312 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -758,7 +758,7 @@ config BFIN_DMA_5XX | |||
758 | choice | 758 | choice |
759 | prompt "Uncached SDRAM region" | 759 | prompt "Uncached SDRAM region" |
760 | default DMA_UNCACHED_1M | 760 | default DMA_UNCACHED_1M |
761 | depends BFIN_DMA_5XX | 761 | depends on BFIN_DMA_5XX |
762 | config DMA_UNCACHED_2M | 762 | config DMA_UNCACHED_2M |
763 | bool "Enable 2M DMA region" | 763 | bool "Enable 2M DMA region" |
764 | config DMA_UNCACHED_1M | 764 | config DMA_UNCACHED_1M |
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index 464f9b4b3169..c939fe86a9e0 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug | |||
@@ -144,7 +144,7 @@ config BDI_SWITCH | |||
144 | 144 | ||
145 | config BOOTX_TEXT | 145 | config BOOTX_TEXT |
146 | bool "Support for early boot text console (BootX or OpenFirmware only)" | 146 | bool "Support for early boot text console (BootX or OpenFirmware only)" |
147 | depends PPC_OF && PPC_MULTIPLATFORM | 147 | depends on PPC_OF && PPC_MULTIPLATFORM |
148 | help | 148 | help |
149 | Say Y here to see progress messages from the boot firmware in text | 149 | Say Y here to see progress messages from the boot firmware in text |
150 | mode. Requires either BootX or Open Firmware. | 150 | mode. Requires either BootX or Open Firmware. |
@@ -234,12 +234,12 @@ endchoice | |||
234 | 234 | ||
235 | config PPC_EARLY_DEBUG_44x_PHYSLOW | 235 | config PPC_EARLY_DEBUG_44x_PHYSLOW |
236 | hex "Low 32 bits of early debug UART physical address" | 236 | hex "Low 32 bits of early debug UART physical address" |
237 | depends PPC_EARLY_DEBUG_44x | 237 | depends on PPC_EARLY_DEBUG_44x |
238 | default "0x40000200" | 238 | default "0x40000200" |
239 | 239 | ||
240 | config PPC_EARLY_DEBUG_44x_PHYSHIGH | 240 | config PPC_EARLY_DEBUG_44x_PHYSHIGH |
241 | hex "EPRN of early debug UART physical address" | 241 | hex "EPRN of early debug UART physical address" |
242 | depends PPC_EARLY_DEBUG_44x | 242 | depends on PPC_EARLY_DEBUG_44x |
243 | default "0x1" | 243 | default "0x1" |
244 | 244 | ||
245 | config PPC_EARLY_DEBUG_CPM_ADDR | 245 | config PPC_EARLY_DEBUG_CPM_ADDR |
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index cc6013ffc29a..186397f283bb 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
@@ -117,7 +117,7 @@ config RTAS_FLASH | |||
117 | 117 | ||
118 | config PPC_PMI | 118 | config PPC_PMI |
119 | tristate "Support for PMI" | 119 | tristate "Support for PMI" |
120 | depends PPC_IBM_CELL_BLADE | 120 | depends on PPC_IBM_CELL_BLADE |
121 | help | 121 | help |
122 | PMI (Platform Management Interrupt) is a way to | 122 | PMI (Platform Management Interrupt) is a way to |
123 | communicate with the BMC (Baseboard Mangement Controller). | 123 | communicate with the BMC (Baseboard Mangement Controller). |
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 |
diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf index 9b44c80dd899..93538e567bda 100644 --- a/scripts/kconfig/zconf.gperf +++ b/scripts/kconfig/zconf.gperf | |||
@@ -23,7 +23,6 @@ help, T_HELP, TF_COMMAND | |||
23 | if, T_IF, TF_COMMAND|TF_PARAM | 23 | if, T_IF, TF_COMMAND|TF_PARAM |
24 | endif, T_ENDIF, TF_COMMAND | 24 | endif, T_ENDIF, TF_COMMAND |
25 | depends, T_DEPENDS, TF_COMMAND | 25 | depends, T_DEPENDS, TF_COMMAND |
26 | requires, T_REQUIRES, TF_COMMAND | ||
27 | optional, T_OPTIONAL, TF_COMMAND | 26 | optional, T_OPTIONAL, TF_COMMAND |
28 | default, T_DEFAULT, TF_COMMAND, S_UNKNOWN | 27 | default, T_DEFAULT, TF_COMMAND, S_UNKNOWN |
29 | prompt, T_PROMPT, TF_COMMAND | 28 | prompt, T_PROMPT, TF_COMMAND |
@@ -32,7 +31,6 @@ def_tristate, T_DEFAULT, TF_COMMAND, S_TRISTATE | |||
32 | bool, T_TYPE, TF_COMMAND, S_BOOLEAN | 31 | bool, T_TYPE, TF_COMMAND, S_BOOLEAN |
33 | boolean, T_TYPE, TF_COMMAND, S_BOOLEAN | 32 | boolean, T_TYPE, TF_COMMAND, S_BOOLEAN |
34 | def_bool, T_DEFAULT, TF_COMMAND, S_BOOLEAN | 33 | def_bool, T_DEFAULT, TF_COMMAND, S_BOOLEAN |
35 | def_boolean, T_DEFAULT, TF_COMMAND, S_BOOLEAN | ||
36 | int, T_TYPE, TF_COMMAND, S_INT | 34 | int, T_TYPE, TF_COMMAND, S_INT |
37 | hex, T_TYPE, TF_COMMAND, S_HEX | 35 | hex, T_TYPE, TF_COMMAND, S_HEX |
38 | string, T_TYPE, TF_COMMAND, S_STRING | 36 | string, T_TYPE, TF_COMMAND, S_STRING |
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 79db4cf22a51..d9b96ba8e38c 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y | |||
@@ -64,7 +64,6 @@ static struct menu *current_menu, *current_entry; | |||
64 | %token <id>T_IF | 64 | %token <id>T_IF |
65 | %token <id>T_ENDIF | 65 | %token <id>T_ENDIF |
66 | %token <id>T_DEPENDS | 66 | %token <id>T_DEPENDS |
67 | %token <id>T_REQUIRES | ||
68 | %token <id>T_OPTIONAL | 67 | %token <id>T_OPTIONAL |
69 | %token <id>T_PROMPT | 68 | %token <id>T_PROMPT |
70 | %token <id>T_TYPE | 69 | %token <id>T_TYPE |
@@ -418,16 +417,6 @@ depends: T_DEPENDS T_ON expr T_EOL | |||
418 | { | 417 | { |
419 | menu_add_dep($3); | 418 | menu_add_dep($3); |
420 | printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); | 419 | printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); |
421 | } | ||
422 | | T_DEPENDS expr T_EOL | ||
423 | { | ||
424 | menu_add_dep($2); | ||
425 | printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno()); | ||
426 | } | ||
427 | | T_REQUIRES expr T_EOL | ||
428 | { | ||
429 | menu_add_dep($2); | ||
430 | printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno()); | ||
431 | }; | 420 | }; |
432 | 421 | ||
433 | /* prompt statement */ | 422 | /* prompt statement */ |