Browse Source

kconfig: Standardize "depends" -> "depends on" in Kconfig files

Standardize the miniscule percentage of occurrences of "depends" in
Kconfig files to "depends on", and update kconfig-language.txt to
reflect that.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Robert P. J. Day 18 years ago
parent
commit
bef1f40261

+ 4 - 4
Documentation/kbuild/kconfig-language.txt

@@ -29,7 +29,7 @@ them. A single configuration option is defined like this:
 
 
 config MODVERSIONS
 config MODVERSIONS
 	bool "Set version information on all module symbols"
 	bool "Set version information on all module symbols"
-	depends MODULES
+	depends on MODULES
 	help
 	help
 	  Usually, modules have to be recompiled whenever you switch to a new
 	  Usually, modules have to be recompiled whenever you switch to a new
 	  kernel.  ...
 	  kernel.  ...
@@ -163,7 +163,7 @@ The position of a menu entry in the tree is determined in two ways. First
 it can be specified explicitly:
 it can be specified explicitly:
 
 
 menu "Network device support"
 menu "Network device support"
-	depends NET
+	depends on NET
 
 
 config NETDEVICES
 config NETDEVICES
 	...
 	...
@@ -188,10 +188,10 @@ config MODULES
 
 
 config MODVERSIONS
 config MODVERSIONS
 	bool "Set version information on all module symbols"
 	bool "Set version information on all module symbols"
-	depends MODULES
+	depends on MODULES
 
 
 comment "module support disabled"
 comment "module support disabled"
-	depends !MODULES
+	depends on !MODULES
 
 
 MODVERSIONS directly depends on MODULES, this means it's only visible if
 MODVERSIONS directly depends on MODULES, this means it's only visible if
 MODULES is different from 'n'. The comment on the other hand is always
 MODULES is different from 'n'. The comment on the other hand is always

+ 8 - 8
arch/arm/mach-pxa/Kconfig

@@ -75,28 +75,28 @@ endmenu
 
 
 config MACH_POODLE
 config MACH_POODLE
 	bool "Enable Sharp SL-5600 (Poodle) Support"
 	bool "Enable Sharp SL-5600 (Poodle) Support"
-	depends PXA_SHARPSL_25x
+	depends on PXA_SHARPSL_25x
 	select SHARP_LOCOMO
 	select SHARP_LOCOMO
 	select PXA_SSP
 	select PXA_SSP
 
 
 config MACH_CORGI
 config MACH_CORGI
 	bool "Enable Sharp SL-C700 (Corgi) Support"
 	bool "Enable Sharp SL-C700 (Corgi) Support"
-	depends PXA_SHARPSL_25x
+	depends on PXA_SHARPSL_25x
 	select PXA_SHARP_C7xx
 	select PXA_SHARP_C7xx
 
 
 config MACH_SHEPHERD
 config MACH_SHEPHERD
 	bool "Enable Sharp SL-C750 (Shepherd) Support"
 	bool "Enable Sharp SL-C750 (Shepherd) Support"
-	depends PXA_SHARPSL_25x
+	depends on PXA_SHARPSL_25x
 	select PXA_SHARP_C7xx
 	select PXA_SHARP_C7xx
 
 
 config MACH_HUSKY
 config MACH_HUSKY
 	bool "Enable Sharp SL-C760 (Husky) Support"
 	bool "Enable Sharp SL-C760 (Husky) Support"
-	depends PXA_SHARPSL_25x
+	depends on PXA_SHARPSL_25x
 	select PXA_SHARP_C7xx
 	select PXA_SHARP_C7xx
 
 
 config MACH_AKITA
 config MACH_AKITA
 	bool "Enable Sharp SL-1000 (Akita) Support"
 	bool "Enable Sharp SL-1000 (Akita) Support"
-	depends PXA_SHARPSL_27x
+	depends on PXA_SHARPSL_27x
 	select PXA_SHARP_Cxx00
 	select PXA_SHARP_Cxx00
 	select MACH_SPITZ
 	select MACH_SPITZ
 	select I2C
 	select I2C
@@ -104,17 +104,17 @@ config MACH_AKITA
 
 
 config MACH_SPITZ
 config MACH_SPITZ
 	bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
 	bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-	depends PXA_SHARPSL_27x
+	depends on PXA_SHARPSL_27x
 	select PXA_SHARP_Cxx00
 	select PXA_SHARP_Cxx00
 
 
 config MACH_BORZOI
 config MACH_BORZOI
 	bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
 	bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
-	depends PXA_SHARPSL_27x
+	depends on PXA_SHARPSL_27x
 	select PXA_SHARP_Cxx00
 	select PXA_SHARP_Cxx00
 
 
 config MACH_TOSA
 config MACH_TOSA
 	bool "Enable Sharp SL-6000x (Tosa) Support"
 	bool "Enable Sharp SL-6000x (Tosa) Support"
-	depends PXA_SHARPSL_25x
+	depends on PXA_SHARPSL_25x
 
 
 config PXA25x
 config PXA25x
 	bool
 	bool

+ 1 - 1
arch/arm/plat-omap/Kconfig

@@ -113,7 +113,7 @@ endchoice
 
 
 config OMAP_SERIAL_WAKE
 config OMAP_SERIAL_WAKE
 	bool "Enable wake-up events for serial ports"
 	bool "Enable wake-up events for serial ports"
-	depends OMAP_MUX
+	depends on OMAP_MUX
 	default y
 	default y
 	help
 	help
 	  Select this option if you want to have your system wake up
 	  Select this option if you want to have your system wake up

+ 1 - 1
arch/powerpc/platforms/4xx/Kconfig

@@ -179,7 +179,7 @@ config BIOS_FIXUP
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 config 403GCX
 config 403GCX
 	bool
 	bool
-	depends OAK
+	depends on OAK
 	default y
 	default y
 
 
 config 405EP
 config 405EP

+ 1 - 1
arch/powerpc/platforms/embedded6xx/Kconfig

@@ -35,7 +35,7 @@ config HDPU
 	  Select HDPU if configuring a Sky Computers Compute Blade.
 	  Select HDPU if configuring a Sky Computers Compute Blade.
 
 
 config HDPU_FEATURES
 config HDPU_FEATURES
-	depends HDPU
+	depends on HDPU
 	tristate "HDPU-Features"
 	tristate "HDPU-Features"
 	help
 	help
 	  Select to enable HDPU enhanced features.
 	  Select to enable HDPU enhanced features.

+ 2 - 2
arch/ppc/Kconfig

@@ -624,7 +624,7 @@ config HDPU
 	  Select HDPU if configuring a Sky Computers Compute Blade.
 	  Select HDPU if configuring a Sky Computers Compute Blade.
 
 
 config HDPU_FEATURES
 config HDPU_FEATURES
-	depends HDPU
+	depends on HDPU
 	tristate "HDPU-Features"
 	tristate "HDPU-Features"
 	help
 	help
 	  Select to enable HDPU enhanced features.
 	  Select to enable HDPU enhanced features.
@@ -735,7 +735,7 @@ config LITE5200
 
 
 config LITE5200B
 config LITE5200B
 	bool "Freescale LITE5200B"
 	bool "Freescale LITE5200B"
-	depends LITE5200
+	depends on LITE5200
 	help
 	help
 	  Support for the LITE5200B dev board for the MPC5200 from Freescale.
 	  Support for the LITE5200B dev board for the MPC5200 from Freescale.
 	  This is the new board with 2 PCI slots.
 	  This is the new board with 2 PCI slots.

+ 1 - 1
arch/ppc/platforms/4xx/Kconfig

@@ -189,7 +189,7 @@ config BIOS_FIXUP
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 config 403GCX
 config 403GCX
 	bool
 	bool
-	depends OAK
+	depends on OAK
 	default y
 	default y
 
 
 config 405EP
 config 405EP

+ 14 - 14
arch/v850/Kconfig

@@ -105,17 +105,17 @@ menu "Processor type and features"
    # currently support
    # currently support
    config V850E_MA1
    config V850E_MA1
    	  bool
    	  bool
-	  depends RTE_CB_MA1
+	  depends on RTE_CB_MA1
 	  default y
 	  default y
    # Similarly for the RTE-V850E/NB85E-CB - V850E/TEG
    # Similarly for the RTE-V850E/NB85E-CB - V850E/TEG
    config V850E_TEG
    config V850E_TEG
    	  bool
    	  bool
-	  depends RTE_CB_NB85E
+	  depends on RTE_CB_NB85E
 	  default y
 	  default y
    # ... and the RTE-V850E/ME2-CB - V850E/ME2
    # ... and the RTE-V850E/ME2-CB - V850E/ME2
    config V850E_ME2
    config V850E_ME2
    	  bool
    	  bool
-	  depends RTE_CB_ME2
+	  depends on RTE_CB_ME2
 	  default y
 	  default y
 
 
 
 
@@ -123,7 +123,7 @@ menu "Processor type and features"
 
 
    config V850E2_SIM85E2
    config V850E2_SIM85E2
    	  bool
    	  bool
-	  depends V850E2_SIM85E2C || V850E2_SIM85E2S
+	  depends on V850E2_SIM85E2C || V850E2_SIM85E2S
 	  default y
 	  default y
 
 
 
 
@@ -132,7 +132,7 @@ menu "Processor type and features"
    # V850E2 processors
    # V850E2 processors
    config V850E2
    config V850E2
    	  bool
    	  bool
-	  depends V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
+	  depends on V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
 	  default y
 	  default y
 
 
 
 
@@ -141,7 +141,7 @@ menu "Processor type and features"
    # Boards in the RTE-x-CB series
    # Boards in the RTE-x-CB series
    config RTE_CB
    config RTE_CB
    	  bool
    	  bool
-	  depends RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
+	  depends on RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
 	  default y
 	  default y
 
 
    config RTE_CB_MULTI
    config RTE_CB_MULTI
@@ -149,28 +149,28 @@ menu "Processor type and features"
 	  # RTE_CB_NB85E can either have multi ROM support or not, but
 	  # RTE_CB_NB85E can either have multi ROM support or not, but
 	  # other platforms (currently only RTE_CB_MA1) require it.
 	  # other platforms (currently only RTE_CB_MA1) require it.
 	  prompt "Multi monitor ROM support" if RTE_CB_NB85E
 	  prompt "Multi monitor ROM support" if RTE_CB_NB85E
-	  depends RTE_CB_MA1 || RTE_CB_NB85E
+	  depends on RTE_CB_MA1 || RTE_CB_NB85E
 	  default y
 	  default y
 
 
    config RTE_CB_MULTI_DBTRAP
    config RTE_CB_MULTI_DBTRAP
    	  bool "Pass illegal insn trap / dbtrap to kernel"
    	  bool "Pass illegal insn trap / dbtrap to kernel"
-	  depends RTE_CB_MULTI
+	  depends on RTE_CB_MULTI
 	  default n
 	  default n
 
 
    config RTE_CB_MA1_KSRAM
    config RTE_CB_MA1_KSRAM
    	  bool "Kernel in SRAM (limits size of kernel)"
    	  bool "Kernel in SRAM (limits size of kernel)"
-	  depends RTE_CB_MA1 && RTE_CB_MULTI
+	  depends on RTE_CB_MA1 && RTE_CB_MULTI
 	  default n
 	  default n
 
 
    config RTE_MB_A_PCI
    config RTE_MB_A_PCI
    	  bool "Mother-A PCI support"
    	  bool "Mother-A PCI support"
-	  depends RTE_CB
+	  depends on RTE_CB
 	  default y
 	  default y
 
 
    # The GBUS is used to talk to the RTE-MOTHER-A board
    # The GBUS is used to talk to the RTE-MOTHER-A board
    config RTE_GBUS_INT
    config RTE_GBUS_INT
    	  bool
    	  bool
-	  depends RTE_MB_A_PCI
+	  depends on RTE_MB_A_PCI
 	  default y
 	  default y
 
 
    # The only PCI bus we support is on the RTE-MOTHER-A board
    # The only PCI bus we support is on the RTE-MOTHER-A board
@@ -209,7 +209,7 @@ menu "Processor type and features"
 
 
    config ROM_KERNEL
    config ROM_KERNEL
    	  bool "Kernel in ROM"
    	  bool "Kernel in ROM"
-	  depends V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2
+	  depends on V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2
 
 
    # Some platforms pre-zero memory, in which case the kernel doesn't need to
    # Some platforms pre-zero memory, in which case the kernel doesn't need to
    config ZERO_BSS
    config ZERO_BSS
@@ -225,10 +225,10 @@ menu "Processor type and features"
 
 
    config V850E_HIGHRES_TIMER
    config V850E_HIGHRES_TIMER
    	  bool "High resolution timer support"
    	  bool "High resolution timer support"
-	  depends V850E_TIMER_D
+	  depends on V850E_TIMER_D
    config TIME_BOOTUP
    config TIME_BOOTUP
    	  bool "Time bootup"
    	  bool "Time bootup"
-	  depends V850E_HIGHRES_TIMER
+	  depends on V850E_HIGHRES_TIMER
 
 
    config RESET_GUARD
    config RESET_GUARD
    	  bool "Reset Guard"
    	  bool "Reset Guard"

+ 1 - 1
drivers/char/Kconfig

@@ -867,7 +867,7 @@ config SONYPI
 
 
 config TANBAC_TB0219
 config TANBAC_TB0219
 	tristate "TANBAC TB0219 base board support"
 	tristate "TANBAC TB0219 base board support"
-	depends TANBAC_TB022X
+	depends on TANBAC_TB022X
 	select GPIO_VR41XX
 	select GPIO_VR41XX
 
 
 source "drivers/char/agp/Kconfig"
 source "drivers/char/agp/Kconfig"

+ 1 - 1
drivers/ide/Kconfig

@@ -796,7 +796,7 @@ endchoice
 config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
 config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
        int "Maximum transfer size (KB) per request (up to 128)"
        int "Maximum transfer size (KB) per request (up to 128)"
        default "128"
        default "128"
-       depends BLK_DEV_IDE_AU1XXX
+       depends on BLK_DEV_IDE_AU1XXX
 
 
 config IDE_ARM
 config IDE_ARM
 	def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
 	def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)

+ 11 - 11
drivers/leds/Kconfig

@@ -12,7 +12,7 @@ config NEW_LEDS
 
 
 config LEDS_CLASS
 config LEDS_CLASS
 	tristate "LED Class Support"
 	tristate "LED Class Support"
-	depends NEW_LEDS
+	depends on NEW_LEDS
 	help
 	help
 	  This option enables the led sysfs class in /sys/class/leds.  You'll
 	  This option enables the led sysfs class in /sys/class/leds.  You'll
 	  need this to do anything useful with LEDs.  If unsure, say N.
 	  need this to do anything useful with LEDs.  If unsure, say N.
@@ -21,28 +21,28 @@ comment "LED drivers"
 
 
 config LEDS_CORGI
 config LEDS_CORGI
 	tristate "LED Support for the Sharp SL-C7x0 series"
 	tristate "LED Support for the Sharp SL-C7x0 series"
-	depends LEDS_CLASS && PXA_SHARP_C7xx
+	depends on LEDS_CLASS && PXA_SHARP_C7xx
 	help
 	help
 	  This option enables support for the LEDs on Sharp Zaurus
 	  This option enables support for the LEDs on Sharp Zaurus
 	  SL-C7x0 series (C700, C750, C760, C860).
 	  SL-C7x0 series (C700, C750, C760, C860).
 
 
 config LEDS_LOCOMO
 config LEDS_LOCOMO
 	tristate "LED Support for Locomo device"
 	tristate "LED Support for Locomo device"
-	depends LEDS_CLASS && SHARP_LOCOMO
+	depends on LEDS_CLASS && SHARP_LOCOMO
 	help
 	help
 	  This option enables support for the LEDs on Sharp Locomo.
 	  This option enables support for the LEDs on Sharp Locomo.
 	  Zaurus models SL-5500 and SL-5600.
 	  Zaurus models SL-5500 and SL-5600.
 
 
 config LEDS_SPITZ
 config LEDS_SPITZ
 	tristate "LED Support for the Sharp SL-Cxx00 series"
 	tristate "LED Support for the Sharp SL-Cxx00 series"
-	depends LEDS_CLASS && PXA_SHARP_Cxx00
+	depends on LEDS_CLASS && PXA_SHARP_Cxx00
 	help
 	help
 	  This option enables support for the LEDs on Sharp Zaurus
 	  This option enables support for the LEDs on Sharp Zaurus
 	  SL-Cxx00 series (C1000, C3000, C3100).
 	  SL-Cxx00 series (C1000, C3000, C3100).
 
 
 config LEDS_IXP4XX
 config LEDS_IXP4XX
 	tristate "LED Support for GPIO connected LEDs on IXP4XX processors"
 	tristate "LED Support for GPIO connected LEDs on IXP4XX processors"
-	depends LEDS_CLASS && ARCH_IXP4XX
+	depends on LEDS_CLASS && ARCH_IXP4XX
 	help
 	help
 	  This option enables support for the LEDs connected to GPIO
 	  This option enables support for the LEDs connected to GPIO
 	  outputs of the Intel IXP4XX processors.  To be useful the
 	  outputs of the Intel IXP4XX processors.  To be useful the
@@ -51,7 +51,7 @@ config LEDS_IXP4XX
 
 
 config LEDS_TOSA
 config LEDS_TOSA
 	tristate "LED Support for the Sharp SL-6000 series"
 	tristate "LED Support for the Sharp SL-6000 series"
-	depends LEDS_CLASS && PXA_SHARPSL
+	depends on LEDS_CLASS && PXA_SHARPSL
 	help
 	help
 	  This option enables support for the LEDs on Sharp Zaurus
 	  This option enables support for the LEDs on Sharp Zaurus
 	  SL-6000 series.
 	  SL-6000 series.
@@ -65,7 +65,7 @@ config LEDS_S3C24XX
 
 
 config LEDS_AMS_DELTA
 config LEDS_AMS_DELTA
 	tristate "LED Support for the Amstrad Delta (E3)"
 	tristate "LED Support for the Amstrad Delta (E3)"
-	depends LEDS_CLASS && MACH_AMS_DELTA
+	depends on LEDS_CLASS && MACH_AMS_DELTA
 	help
 	help
 	  This option enables support for the LEDs on Amstrad Delta (E3).
 	  This option enables support for the LEDs on Amstrad Delta (E3).
 
 
@@ -86,7 +86,7 @@ comment "LED Triggers"
 
 
 config LEDS_TRIGGERS
 config LEDS_TRIGGERS
 	bool "LED Trigger support"
 	bool "LED Trigger support"
-	depends NEW_LEDS
+	depends on NEW_LEDS
 	help
 	help
 	  This option enables trigger support for the leds class.
 	  This option enables trigger support for the leds class.
 	  These triggers allow kernel events to drive the LEDs and can
 	  These triggers allow kernel events to drive the LEDs and can
@@ -94,21 +94,21 @@ config LEDS_TRIGGERS
 
 
 config LEDS_TRIGGER_TIMER
 config LEDS_TRIGGER_TIMER
 	tristate "LED Timer Trigger"
 	tristate "LED Timer Trigger"
-	depends LEDS_TRIGGERS
+	depends on LEDS_TRIGGERS
 	help
 	help
 	  This allows LEDs to be controlled by a programmable timer
 	  This allows LEDs to be controlled by a programmable timer
 	  via sysfs. If unsure, say Y.
 	  via sysfs. If unsure, say Y.
 
 
 config LEDS_TRIGGER_IDE_DISK
 config LEDS_TRIGGER_IDE_DISK
 	bool "LED IDE Disk Trigger"
 	bool "LED IDE Disk Trigger"
-	depends LEDS_TRIGGERS && BLK_DEV_IDEDISK
+	depends on LEDS_TRIGGERS && BLK_DEV_IDEDISK
 	help
 	help
 	  This allows LEDs to be controlled by IDE disk activity.
 	  This allows LEDs to be controlled by IDE disk activity.
 	  If unsure, say Y.
 	  If unsure, say Y.
 
 
 config LEDS_TRIGGER_HEARTBEAT
 config LEDS_TRIGGER_HEARTBEAT
 	tristate "LED Heartbeat Trigger"
 	tristate "LED Heartbeat Trigger"
-	depends LEDS_TRIGGERS
+	depends on LEDS_TRIGGERS
 	help
 	help
 	  This allows LEDs to be controlled by a CPU load average.
 	  This allows LEDs to be controlled by a CPU load average.
 	  The flash frequency is a hyperbolic function of the 1-minute
 	  The flash frequency is a hyperbolic function of the 1-minute

+ 2 - 2
drivers/serial/Kconfig

@@ -663,7 +663,7 @@ config V850E_UART
 
 
 config V850E_UARTB
 config V850E_UARTB
         bool
         bool
-	depends V850E_UART && V850E_ME2
+	depends on V850E_UART && V850E_ME2
 	default y
 	default y
 
 
 config V850E_UART_CONSOLE
 config V850E_UART_CONSOLE
@@ -909,7 +909,7 @@ config SERIAL_M32R_PLDSIO
 
 
 config SERIAL_TXX9
 config SERIAL_TXX9
 	bool "TMPTX39XX/49XX SIO support"
 	bool "TMPTX39XX/49XX SIO support"
-	depends HAS_TXX9_SERIAL
+	depends on HAS_TXX9_SERIAL
 	select SERIAL_CORE
 	select SERIAL_CORE
 	default y
 	default y
 
 

+ 1 - 1
fs/Kconfig

@@ -1002,7 +1002,7 @@ config TMPFS_POSIX_ACL
 
 
 config HUGETLBFS
 config HUGETLBFS
 	bool "HugeTLB file system support"
 	bool "HugeTLB file system support"
-	depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
+	depends on X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
 	help
 	help
 	  hugetlbfs is a filesystem backing for HugeTLB pages, based on
 	  hugetlbfs is a filesystem backing for HugeTLB pages, based on
 	  ramfs. For architectures that support it, say Y here and read
 	  ramfs. For architectures that support it, say Y here and read

+ 1 - 1
sound/aoa/fabrics/Kconfig

@@ -1,6 +1,6 @@
 config SND_AOA_FABRIC_LAYOUT
 config SND_AOA_FABRIC_LAYOUT
 	tristate "layout-id fabric"
 	tristate "layout-id fabric"
-	depends SND_AOA
+	depends on SND_AOA
 	select SND_AOA_SOUNDBUS
 	select SND_AOA_SOUNDBUS
 	select SND_AOA_SOUNDBUS_I2S
 	select SND_AOA_SOUNDBUS_I2S
 	---help---
 	---help---