diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index b24f4535ffe036133bf2d9d3bc7cc7e538e2e27f..aa9db3073312c2d8c18ce1726e492a4f4eb61e3a 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -758,7 +758,7 @@ config BFIN_DMA_5XX choice prompt "Uncached SDRAM region" default DMA_UNCACHED_1M - depends BFIN_DMA_5XX + depends on BFIN_DMA_5XX config DMA_UNCACHED_2M bool "Enable 2M DMA region" config DMA_UNCACHED_1M diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index 464f9b4b3169ba6ad1b2f5669f38e13f46a9c02a..c939fe86a9e007cee6474eeb9bdb8d01d9f18896 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug @@ -144,7 +144,7 @@ config BDI_SWITCH config BOOTX_TEXT bool "Support for early boot text console (BootX or OpenFirmware only)" - depends PPC_OF && PPC_MULTIPLATFORM + depends on PPC_OF && PPC_MULTIPLATFORM help Say Y here to see progress messages from the boot firmware in text mode. Requires either BootX or Open Firmware. @@ -234,12 +234,12 @@ endchoice config PPC_EARLY_DEBUG_44x_PHYSLOW hex "Low 32 bits of early debug UART physical address" - depends PPC_EARLY_DEBUG_44x + depends on PPC_EARLY_DEBUG_44x default "0x40000200" config PPC_EARLY_DEBUG_44x_PHYSHIGH hex "EPRN of early debug UART physical address" - depends PPC_EARLY_DEBUG_44x + depends on PPC_EARLY_DEBUG_44x default "0x1" config PPC_EARLY_DEBUG_CPM_ADDR diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index cc6013ffc29ae7957281d28406cd426f6dc13e51..186397f283bbbcbc187f75e235b172f584d3619e 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -117,7 +117,7 @@ config RTAS_FLASH config PPC_PMI tristate "Support for PMI" - depends PPC_IBM_CELL_BLADE + depends on PPC_IBM_CELL_BLADE help PMI (Platform Management Interrupt) is a way to communicate with the BMC (Baseboard Mangement Controller). diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index d602b8fa7d46f3020e670844fd406098ff79d5bd..7acc6351bb44c9156c7afd93aa7671e4959a4a2a 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -152,7 +152,7 @@ config INPUT_POWERMATE config INPUT_YEALINK tristate "Yealink usb-p1k voip phone" - depends EXPERIMENTAL + depends on EXPERIMENTAL depends on USB_ARCH_HAS_HCD select USB help diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 3cb23210b912239cd4f800106f3dd03aaed95b73..c12bd664ea59780ac035bb15c29f482c97c2f411 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -83,7 +83,7 @@ config LEDS_WRAP config LEDS_H1940 tristate "LED Support for iPAQ H1940 device" - depends LEDS_CLASS && ARCH_H1940 + depends on LEDS_CLASS && ARCH_H1940 help This option enables support for the LEDs on the h1940. diff --git a/drivers/telephony/Kconfig b/drivers/telephony/Kconfig index 5f98f673f1b675002e57b31dfb25194e7e9ed002..b5f78b6ed2bd1295fb1a5349b3d97b466d6eb335 100644 --- a/drivers/telephony/Kconfig +++ b/drivers/telephony/Kconfig @@ -19,7 +19,7 @@ if PHONE config PHONE_IXJ tristate "QuickNet Internet LineJack/PhoneJack support" - depends ISA || PCI + depends on ISA || PCI ---help--- Say M if you have a telephony card manufactured by Quicknet Technologies, Inc. These include the Internet PhoneJACK and diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf index 9b44c80dd8994308884fa138b6ce249cff5603fc..93538e567bda8e31943b857a3b50e567fa5c691a 100644 --- a/scripts/kconfig/zconf.gperf +++ b/scripts/kconfig/zconf.gperf @@ -23,7 +23,6 @@ help, T_HELP, TF_COMMAND if, T_IF, TF_COMMAND|TF_PARAM endif, T_ENDIF, TF_COMMAND depends, T_DEPENDS, TF_COMMAND -requires, T_REQUIRES, TF_COMMAND optional, T_OPTIONAL, TF_COMMAND default, T_DEFAULT, TF_COMMAND, S_UNKNOWN prompt, T_PROMPT, TF_COMMAND @@ -32,7 +31,6 @@ def_tristate, T_DEFAULT, TF_COMMAND, S_TRISTATE bool, T_TYPE, TF_COMMAND, S_BOOLEAN boolean, T_TYPE, TF_COMMAND, S_BOOLEAN def_bool, T_DEFAULT, TF_COMMAND, S_BOOLEAN -def_boolean, T_DEFAULT, TF_COMMAND, S_BOOLEAN int, T_TYPE, TF_COMMAND, S_INT hex, T_TYPE, TF_COMMAND, S_HEX string, T_TYPE, TF_COMMAND, S_STRING diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 79db4cf22a5127000f90fabfbee7b13c90c2d415..d9b96ba8e38caf6e3cf083b012272bd4ef041827 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -64,7 +64,6 @@ static struct menu *current_menu, *current_entry; %token T_IF %token T_ENDIF %token T_DEPENDS -%token T_REQUIRES %token T_OPTIONAL %token T_PROMPT %token T_TYPE @@ -418,16 +417,6 @@ depends: T_DEPENDS T_ON expr T_EOL { menu_add_dep($3); printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); -} - | T_DEPENDS expr T_EOL -{ - menu_add_dep($2); - printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno()); -} - | T_REQUIRES expr T_EOL -{ - menu_add_dep($2); - printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno()); }; /* prompt statement */