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 /arch | |
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 'arch')
-rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/Kconfig.debug | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 2 |
3 files changed, 5 insertions, 5 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). |