Skip to content

Commit

Permalink
kconfig: Standardize "depends" -> "depends on" in Kconfig files
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>
  • Loading branch information
Robert P. J. Day authored and AdrianBunk committed Dec 12, 2006
1 parent c48e3fc commit bef1f40
Show file tree
Hide file tree
Showing 14 changed files with 49 additions and 49 deletions.
8 changes: 4 additions & 4 deletions Documentation/kbuild/kconfig-language.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ them. A single configuration option is defined like this:

config MODVERSIONS
bool "Set version information on all module symbols"
depends MODULES
depends on MODULES
help
Usually, modules have to be recompiled whenever you switch to a new
kernel. ...
Expand Down Expand Up @@ -163,7 +163,7 @@ The position of a menu entry in the tree is determined in two ways. First
it can be specified explicitly:

menu "Network device support"
depends NET
depends on NET

config NETDEVICES
...
Expand All @@ -188,10 +188,10 @@ config MODULES

config MODVERSIONS
bool "Set version information on all module symbols"
depends MODULES
depends on MODULES

comment "module support disabled"
depends !MODULES
depends on !MODULES

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
Expand Down
16 changes: 8 additions & 8 deletions arch/arm/mach-pxa/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -75,46 +75,46 @@ endmenu

config MACH_POODLE
bool "Enable Sharp SL-5600 (Poodle) Support"
depends PXA_SHARPSL_25x
depends on PXA_SHARPSL_25x
select SHARP_LOCOMO
select PXA_SSP

config MACH_CORGI
bool "Enable Sharp SL-C700 (Corgi) Support"
depends PXA_SHARPSL_25x
depends on PXA_SHARPSL_25x
select PXA_SHARP_C7xx

config MACH_SHEPHERD
bool "Enable Sharp SL-C750 (Shepherd) Support"
depends PXA_SHARPSL_25x
depends on PXA_SHARPSL_25x
select PXA_SHARP_C7xx

config MACH_HUSKY
bool "Enable Sharp SL-C760 (Husky) Support"
depends PXA_SHARPSL_25x
depends on PXA_SHARPSL_25x
select PXA_SHARP_C7xx

config MACH_AKITA
bool "Enable Sharp SL-1000 (Akita) Support"
depends PXA_SHARPSL_27x
depends on PXA_SHARPSL_27x
select PXA_SHARP_Cxx00
select MACH_SPITZ
select I2C
select I2C_PXA

config MACH_SPITZ
bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
depends PXA_SHARPSL_27x
depends on PXA_SHARPSL_27x
select PXA_SHARP_Cxx00

config MACH_BORZOI
bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
depends PXA_SHARPSL_27x
depends on PXA_SHARPSL_27x
select PXA_SHARP_Cxx00

config MACH_TOSA
bool "Enable Sharp SL-6000x (Tosa) Support"
depends PXA_SHARPSL_25x
depends on PXA_SHARPSL_25x

config PXA25x
bool
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/plat-omap/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ endchoice

config OMAP_SERIAL_WAKE
bool "Enable wake-up events for serial ports"
depends OMAP_MUX
depends on OMAP_MUX
default y
help
Select this option if you want to have your system wake up
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/4xx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ config BIOS_FIXUP
# OAK doesn't exist but wanted to keep this around for any future 403GCX boards
config 403GCX
bool
depends OAK
depends on OAK
default y

config 405EP
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/embedded6xx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ config HDPU
Select HDPU if configuring a Sky Computers Compute Blade.

config HDPU_FEATURES
depends HDPU
depends on HDPU
tristate "HDPU-Features"
help
Select to enable HDPU enhanced features.
Expand Down
4 changes: 2 additions & 2 deletions arch/ppc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ config HDPU
Select HDPU if configuring a Sky Computers Compute Blade.

config HDPU_FEATURES
depends HDPU
depends on HDPU
tristate "HDPU-Features"
help
Select to enable HDPU enhanced features.
Expand Down Expand Up @@ -735,7 +735,7 @@ config LITE5200

config LITE5200B
bool "Freescale LITE5200B"
depends LITE5200
depends on LITE5200
help
Support for the LITE5200B dev board for the MPC5200 from Freescale.
This is the new board with 2 PCI slots.
Expand Down
2 changes: 1 addition & 1 deletion arch/ppc/platforms/4xx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ config BIOS_FIXUP
# OAK doesn't exist but wanted to keep this around for any future 403GCX boards
config 403GCX
bool
depends OAK
depends on OAK
default y

config 405EP
Expand Down
28 changes: 14 additions & 14 deletions arch/v850/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -105,25 +105,25 @@ menu "Processor type and features"
# currently support
config V850E_MA1
bool
depends RTE_CB_MA1
depends on RTE_CB_MA1
default y
# Similarly for the RTE-V850E/NB85E-CB - V850E/TEG
config V850E_TEG
bool
depends RTE_CB_NB85E
depends on RTE_CB_NB85E
default y
# ... and the RTE-V850E/ME2-CB - V850E/ME2
config V850E_ME2
bool
depends RTE_CB_ME2
depends on RTE_CB_ME2
default y


#### sim85e2-specific config

config V850E2_SIM85E2
bool
depends V850E2_SIM85E2C || V850E2_SIM85E2S
depends on V850E2_SIM85E2C || V850E2_SIM85E2S
default y


Expand All @@ -132,7 +132,7 @@ menu "Processor type and features"
# V850E2 processors
config V850E2
bool
depends V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
depends on V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
default y


Expand All @@ -141,36 +141,36 @@ menu "Processor type and features"
# Boards in the RTE-x-CB series
config RTE_CB
bool
depends RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
depends on RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
default y

config RTE_CB_MULTI
bool
# RTE_CB_NB85E can either have multi ROM support or not, but
# other platforms (currently only RTE_CB_MA1) require it.
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

config RTE_CB_MULTI_DBTRAP
bool "Pass illegal insn trap / dbtrap to kernel"
depends RTE_CB_MULTI
depends on RTE_CB_MULTI
default n

config RTE_CB_MA1_KSRAM
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

config RTE_MB_A_PCI
bool "Mother-A PCI support"
depends RTE_CB
depends on RTE_CB
default y

# The GBUS is used to talk to the RTE-MOTHER-A board
config RTE_GBUS_INT
bool
depends RTE_MB_A_PCI
depends on RTE_MB_A_PCI
default y

# The only PCI bus we support is on the RTE-MOTHER-A board
Expand Down Expand Up @@ -209,7 +209,7 @@ menu "Processor type and features"

config ROM_KERNEL
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
config ZERO_BSS
Expand All @@ -225,10 +225,10 @@ menu "Processor type and features"

config V850E_HIGHRES_TIMER
bool "High resolution timer support"
depends V850E_TIMER_D
depends on V850E_TIMER_D
config TIME_BOOTUP
bool "Time bootup"
depends V850E_HIGHRES_TIMER
depends on V850E_HIGHRES_TIMER

config RESET_GUARD
bool "Reset Guard"
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ config SONYPI

config TANBAC_TB0219
tristate "TANBAC TB0219 base board support"
depends TANBAC_TB022X
depends on TANBAC_TB022X
select GPIO_VR41XX

source "drivers/char/agp/Kconfig"
Expand Down
2 changes: 1 addition & 1 deletion drivers/ide/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ endchoice
config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
int "Maximum transfer size (KB) per request (up to 128)"
default "128"
depends BLK_DEV_IDE_AU1XXX
depends on BLK_DEV_IDE_AU1XXX

config IDE_ARM
def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
Expand Down
22 changes: 11 additions & 11 deletions drivers/leds/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config NEW_LEDS

config LEDS_CLASS
tristate "LED Class Support"
depends NEW_LEDS
depends on NEW_LEDS
help
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.
Expand All @@ -21,28 +21,28 @@ comment "LED drivers"

config LEDS_CORGI
tristate "LED Support for the Sharp SL-C7x0 series"
depends LEDS_CLASS && PXA_SHARP_C7xx
depends on LEDS_CLASS && PXA_SHARP_C7xx
help
This option enables support for the LEDs on Sharp Zaurus
SL-C7x0 series (C700, C750, C760, C860).

config LEDS_LOCOMO
tristate "LED Support for Locomo device"
depends LEDS_CLASS && SHARP_LOCOMO
depends on LEDS_CLASS && SHARP_LOCOMO
help
This option enables support for the LEDs on Sharp Locomo.
Zaurus models SL-5500 and SL-5600.

config LEDS_SPITZ
tristate "LED Support for the Sharp SL-Cxx00 series"
depends LEDS_CLASS && PXA_SHARP_Cxx00
depends on LEDS_CLASS && PXA_SHARP_Cxx00
help
This option enables support for the LEDs on Sharp Zaurus
SL-Cxx00 series (C1000, C3000, C3100).

config LEDS_IXP4XX
tristate "LED Support for GPIO connected LEDs on IXP4XX processors"
depends LEDS_CLASS && ARCH_IXP4XX
depends on LEDS_CLASS && ARCH_IXP4XX
help
This option enables support for the LEDs connected to GPIO
outputs of the Intel IXP4XX processors. To be useful the
Expand All @@ -51,7 +51,7 @@ config LEDS_IXP4XX

config LEDS_TOSA
tristate "LED Support for the Sharp SL-6000 series"
depends LEDS_CLASS && PXA_SHARPSL
depends on LEDS_CLASS && PXA_SHARPSL
help
This option enables support for the LEDs on Sharp Zaurus
SL-6000 series.
Expand All @@ -65,7 +65,7 @@ config LEDS_S3C24XX

config LEDS_AMS_DELTA
tristate "LED Support for the Amstrad Delta (E3)"
depends LEDS_CLASS && MACH_AMS_DELTA
depends on LEDS_CLASS && MACH_AMS_DELTA
help
This option enables support for the LEDs on Amstrad Delta (E3).

Expand All @@ -86,29 +86,29 @@ comment "LED Triggers"

config LEDS_TRIGGERS
bool "LED Trigger support"
depends NEW_LEDS
depends on NEW_LEDS
help
This option enables trigger support for the leds class.
These triggers allow kernel events to drive the LEDs and can
be configured via sysfs. If unsure, say Y.

config LEDS_TRIGGER_TIMER
tristate "LED Timer Trigger"
depends LEDS_TRIGGERS
depends on LEDS_TRIGGERS
help
This allows LEDs to be controlled by a programmable timer
via sysfs. If unsure, say Y.

config LEDS_TRIGGER_IDE_DISK
bool "LED IDE Disk Trigger"
depends LEDS_TRIGGERS && BLK_DEV_IDEDISK
depends on LEDS_TRIGGERS && BLK_DEV_IDEDISK
help
This allows LEDs to be controlled by IDE disk activity.
If unsure, say Y.

config LEDS_TRIGGER_HEARTBEAT
tristate "LED Heartbeat Trigger"
depends LEDS_TRIGGERS
depends on LEDS_TRIGGERS
help
This allows LEDs to be controlled by a CPU load average.
The flash frequency is a hyperbolic function of the 1-minute
Expand Down
4 changes: 2 additions & 2 deletions drivers/serial/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ config V850E_UART

config V850E_UARTB
bool
depends V850E_UART && V850E_ME2
depends on V850E_UART && V850E_ME2
default y

config V850E_UART_CONSOLE
Expand Down Expand Up @@ -909,7 +909,7 @@ config SERIAL_M32R_PLDSIO

config SERIAL_TXX9
bool "TMPTX39XX/49XX SIO support"
depends HAS_TXX9_SERIAL
depends on HAS_TXX9_SERIAL
select SERIAL_CORE
default y

Expand Down
2 changes: 1 addition & 1 deletion fs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ config TMPFS_POSIX_ACL

config HUGETLBFS
bool "HugeTLB file system support"
depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
depends on X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
help
hugetlbfs is a filesystem backing for HugeTLB pages, based on
ramfs. For architectures that support it, say Y here and read
Expand Down
2 changes: 1 addition & 1 deletion sound/aoa/fabrics/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config SND_AOA_FABRIC_LAYOUT
tristate "layout-id fabric"
depends SND_AOA
depends on SND_AOA
select SND_AOA_SOUNDBUS
select SND_AOA_SOUNDBUS_I2S
---help---
Expand Down

0 comments on commit bef1f40

Please sign in to comment.