Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 247537b9 authored by Adrian Bunk's avatar Adrian Bunk Committed by Sam Ravnborg
Browse files

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: default avatarAdrian 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 4f1127e2

arch/blackfin/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/powerpc/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -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

arch/powerpc/platforms/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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).

drivers/input/misc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/leds/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.