tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by Robert P. J. Day and committed by Adrian Bunk bef1f402 c48e3fca

+49 -49
unified split
+4 -4
Documentation/kbuild/kconfig-language.txt
··· 29 30 config MODVERSIONS 31 bool "Set version information on all module symbols" 32 - depends MODULES 33 help 34 Usually, modules have to be recompiled whenever you switch to a new 35 kernel. ... ··· 163 it can be specified explicitly: 164 165 menu "Network device support" 166 - depends NET 167 168 config NETDEVICES 169 ... ··· 188 189 config MODVERSIONS 190 bool "Set version information on all module symbols" 191 - depends MODULES 192 193 comment "module support disabled" 194 - depends !MODULES 195 196 MODVERSIONS directly depends on MODULES, this means it's only visible if 197 MODULES is different from 'n'. The comment on the other hand is always
··· 29 30 config MODVERSIONS 31 bool "Set version information on all module symbols" 32 + depends on MODULES 33 help 34 Usually, modules have to be recompiled whenever you switch to a new 35 kernel. ... ··· 163 it can be specified explicitly: 164 165 menu "Network device support" 166 + depends on NET 167 168 config NETDEVICES 169 ... ··· 188 189 config MODVERSIONS 190 bool "Set version information on all module symbols" 191 + depends on MODULES 192 193 comment "module support disabled" 194 + depends on !MODULES 195 196 MODVERSIONS directly depends on MODULES, this means it's only visible if 197 MODULES is different from 'n'. The comment on the other hand is always
+8 -8
arch/arm/mach-pxa/Kconfig
··· 75 76 config MACH_POODLE 77 bool "Enable Sharp SL-5600 (Poodle) Support" 78 - depends PXA_SHARPSL_25x 79 select SHARP_LOCOMO 80 select PXA_SSP 81 82 config MACH_CORGI 83 bool "Enable Sharp SL-C700 (Corgi) Support" 84 - depends PXA_SHARPSL_25x 85 select PXA_SHARP_C7xx 86 87 config MACH_SHEPHERD 88 bool "Enable Sharp SL-C750 (Shepherd) Support" 89 - depends PXA_SHARPSL_25x 90 select PXA_SHARP_C7xx 91 92 config MACH_HUSKY 93 bool "Enable Sharp SL-C760 (Husky) Support" 94 - depends PXA_SHARPSL_25x 95 select PXA_SHARP_C7xx 96 97 config MACH_AKITA 98 bool "Enable Sharp SL-1000 (Akita) Support" 99 - depends PXA_SHARPSL_27x 100 select PXA_SHARP_Cxx00 101 select MACH_SPITZ 102 select I2C ··· 104 105 config MACH_SPITZ 106 bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" 107 - depends PXA_SHARPSL_27x 108 select PXA_SHARP_Cxx00 109 110 config MACH_BORZOI 111 bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" 112 - depends PXA_SHARPSL_27x 113 select PXA_SHARP_Cxx00 114 115 config MACH_TOSA 116 bool "Enable Sharp SL-6000x (Tosa) Support" 117 - depends PXA_SHARPSL_25x 118 119 config PXA25x 120 bool
··· 75 76 config MACH_POODLE 77 bool "Enable Sharp SL-5600 (Poodle) Support" 78 + depends on PXA_SHARPSL_25x 79 select SHARP_LOCOMO 80 select PXA_SSP 81 82 config MACH_CORGI 83 bool "Enable Sharp SL-C700 (Corgi) Support" 84 + depends on PXA_SHARPSL_25x 85 select PXA_SHARP_C7xx 86 87 config MACH_SHEPHERD 88 bool "Enable Sharp SL-C750 (Shepherd) Support" 89 + depends on PXA_SHARPSL_25x 90 select PXA_SHARP_C7xx 91 92 config MACH_HUSKY 93 bool "Enable Sharp SL-C760 (Husky) Support" 94 + depends on PXA_SHARPSL_25x 95 select PXA_SHARP_C7xx 96 97 config MACH_AKITA 98 bool "Enable Sharp SL-1000 (Akita) Support" 99 + depends on PXA_SHARPSL_27x 100 select PXA_SHARP_Cxx00 101 select MACH_SPITZ 102 select I2C ··· 104 105 config MACH_SPITZ 106 bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" 107 + depends on PXA_SHARPSL_27x 108 select PXA_SHARP_Cxx00 109 110 config MACH_BORZOI 111 bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" 112 + depends on PXA_SHARPSL_27x 113 select PXA_SHARP_Cxx00 114 115 config MACH_TOSA 116 bool "Enable Sharp SL-6000x (Tosa) Support" 117 + depends on PXA_SHARPSL_25x 118 119 config PXA25x 120 bool
+1 -1
arch/arm/plat-omap/Kconfig
··· 113 114 config OMAP_SERIAL_WAKE 115 bool "Enable wake-up events for serial ports" 116 - depends OMAP_MUX 117 default y 118 help 119 Select this option if you want to have your system wake up
··· 113 114 config OMAP_SERIAL_WAKE 115 bool "Enable wake-up events for serial ports" 116 + depends on OMAP_MUX 117 default y 118 help 119 Select this option if you want to have your system wake up
+1 -1
arch/powerpc/platforms/4xx/Kconfig
··· 179 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards 180 config 403GCX 181 bool 182 - depends OAK 183 default y 184 185 config 405EP
··· 179 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards 180 config 403GCX 181 bool 182 + depends on OAK 183 default y 184 185 config 405EP
+1 -1
arch/powerpc/platforms/embedded6xx/Kconfig
··· 35 Select HDPU if configuring a Sky Computers Compute Blade. 36 37 config HDPU_FEATURES 38 - depends HDPU 39 tristate "HDPU-Features" 40 help 41 Select to enable HDPU enhanced features.
··· 35 Select HDPU if configuring a Sky Computers Compute Blade. 36 37 config HDPU_FEATURES 38 + depends on HDPU 39 tristate "HDPU-Features" 40 help 41 Select to enable HDPU enhanced features.
+2 -2
arch/ppc/Kconfig
··· 624 Select HDPU if configuring a Sky Computers Compute Blade. 625 626 config HDPU_FEATURES 627 - depends HDPU 628 tristate "HDPU-Features" 629 help 630 Select to enable HDPU enhanced features. ··· 735 736 config LITE5200B 737 bool "Freescale LITE5200B" 738 - depends LITE5200 739 help 740 Support for the LITE5200B dev board for the MPC5200 from Freescale. 741 This is the new board with 2 PCI slots.
··· 624 Select HDPU if configuring a Sky Computers Compute Blade. 625 626 config HDPU_FEATURES 627 + depends on HDPU 628 tristate "HDPU-Features" 629 help 630 Select to enable HDPU enhanced features. ··· 735 736 config LITE5200B 737 bool "Freescale LITE5200B" 738 + depends on LITE5200 739 help 740 Support for the LITE5200B dev board for the MPC5200 from Freescale. 741 This is the new board with 2 PCI slots.
+1 -1
arch/ppc/platforms/4xx/Kconfig
··· 189 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards 190 config 403GCX 191 bool 192 - depends OAK 193 default y 194 195 config 405EP
··· 189 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards 190 config 403GCX 191 bool 192 + depends on OAK 193 default y 194 195 config 405EP
+14 -14
arch/v850/Kconfig
··· 105 # currently support 106 config V850E_MA1 107 bool 108 - depends RTE_CB_MA1 109 default y 110 # Similarly for the RTE-V850E/NB85E-CB - V850E/TEG 111 config V850E_TEG 112 bool 113 - depends RTE_CB_NB85E 114 default y 115 # ... and the RTE-V850E/ME2-CB - V850E/ME2 116 config V850E_ME2 117 bool 118 - depends RTE_CB_ME2 119 default y 120 121 ··· 123 124 config V850E2_SIM85E2 125 bool 126 - depends V850E2_SIM85E2C || V850E2_SIM85E2S 127 default y 128 129 ··· 132 # V850E2 processors 133 config V850E2 134 bool 135 - depends V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA 136 default y 137 138 ··· 141 # Boards in the RTE-x-CB series 142 config RTE_CB 143 bool 144 - depends RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2 145 default y 146 147 config RTE_CB_MULTI ··· 149 # RTE_CB_NB85E can either have multi ROM support or not, but 150 # other platforms (currently only RTE_CB_MA1) require it. 151 prompt "Multi monitor ROM support" if RTE_CB_NB85E 152 - depends RTE_CB_MA1 || RTE_CB_NB85E 153 default y 154 155 config RTE_CB_MULTI_DBTRAP 156 bool "Pass illegal insn trap / dbtrap to kernel" 157 - depends RTE_CB_MULTI 158 default n 159 160 config RTE_CB_MA1_KSRAM 161 bool "Kernel in SRAM (limits size of kernel)" 162 - depends RTE_CB_MA1 && RTE_CB_MULTI 163 default n 164 165 config RTE_MB_A_PCI 166 bool "Mother-A PCI support" 167 - depends RTE_CB 168 default y 169 170 # The GBUS is used to talk to the RTE-MOTHER-A board 171 config RTE_GBUS_INT 172 bool 173 - depends RTE_MB_A_PCI 174 default y 175 176 # The only PCI bus we support is on the RTE-MOTHER-A board ··· 209 210 config ROM_KERNEL 211 bool "Kernel in ROM" 212 - depends V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2 213 214 # Some platforms pre-zero memory, in which case the kernel doesn't need to 215 config ZERO_BSS ··· 225 226 config V850E_HIGHRES_TIMER 227 bool "High resolution timer support" 228 - depends V850E_TIMER_D 229 config TIME_BOOTUP 230 bool "Time bootup" 231 - depends V850E_HIGHRES_TIMER 232 233 config RESET_GUARD 234 bool "Reset Guard"
··· 105 # currently support 106 config V850E_MA1 107 bool 108 + depends on RTE_CB_MA1 109 default y 110 # Similarly for the RTE-V850E/NB85E-CB - V850E/TEG 111 config V850E_TEG 112 bool 113 + depends on RTE_CB_NB85E 114 default y 115 # ... and the RTE-V850E/ME2-CB - V850E/ME2 116 config V850E_ME2 117 bool 118 + depends on RTE_CB_ME2 119 default y 120 121 ··· 123 124 config V850E2_SIM85E2 125 bool 126 + depends on V850E2_SIM85E2C || V850E2_SIM85E2S 127 default y 128 129 ··· 132 # V850E2 processors 133 config V850E2 134 bool 135 + depends on V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA 136 default y 137 138 ··· 141 # Boards in the RTE-x-CB series 142 config RTE_CB 143 bool 144 + depends on RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2 145 default y 146 147 config RTE_CB_MULTI ··· 149 # RTE_CB_NB85E can either have multi ROM support or not, but 150 # other platforms (currently only RTE_CB_MA1) require it. 151 prompt "Multi monitor ROM support" if RTE_CB_NB85E 152 + depends on RTE_CB_MA1 || RTE_CB_NB85E 153 default y 154 155 config RTE_CB_MULTI_DBTRAP 156 bool "Pass illegal insn trap / dbtrap to kernel" 157 + depends on RTE_CB_MULTI 158 default n 159 160 config RTE_CB_MA1_KSRAM 161 bool "Kernel in SRAM (limits size of kernel)" 162 + depends on RTE_CB_MA1 && RTE_CB_MULTI 163 default n 164 165 config RTE_MB_A_PCI 166 bool "Mother-A PCI support" 167 + depends on RTE_CB 168 default y 169 170 # The GBUS is used to talk to the RTE-MOTHER-A board 171 config RTE_GBUS_INT 172 bool 173 + depends on RTE_MB_A_PCI 174 default y 175 176 # The only PCI bus we support is on the RTE-MOTHER-A board ··· 209 210 config ROM_KERNEL 211 bool "Kernel in ROM" 212 + depends on V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2 213 214 # Some platforms pre-zero memory, in which case the kernel doesn't need to 215 config ZERO_BSS ··· 225 226 config V850E_HIGHRES_TIMER 227 bool "High resolution timer support" 228 + depends on V850E_TIMER_D 229 config TIME_BOOTUP 230 bool "Time bootup" 231 + depends on V850E_HIGHRES_TIMER 232 233 config RESET_GUARD 234 bool "Reset Guard"
+1 -1
drivers/char/Kconfig
··· 867 868 config TANBAC_TB0219 869 tristate "TANBAC TB0219 base board support" 870 - depends TANBAC_TB022X 871 select GPIO_VR41XX 872 873 source "drivers/char/agp/Kconfig"
··· 867 868 config TANBAC_TB0219 869 tristate "TANBAC TB0219 base board support" 870 + depends on TANBAC_TB022X 871 select GPIO_VR41XX 872 873 source "drivers/char/agp/Kconfig"
+1 -1
drivers/ide/Kconfig
··· 796 config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ 797 int "Maximum transfer size (KB) per request (up to 128)" 798 default "128" 799 - depends BLK_DEV_IDE_AU1XXX 800 801 config IDE_ARM 802 def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
··· 796 config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ 797 int "Maximum transfer size (KB) per request (up to 128)" 798 default "128" 799 + depends on BLK_DEV_IDE_AU1XXX 800 801 config IDE_ARM 802 def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
+11 -11
drivers/leds/Kconfig
··· 12 13 config LEDS_CLASS 14 tristate "LED Class Support" 15 - depends NEW_LEDS 16 help 17 This option enables the led sysfs class in /sys/class/leds. You'll 18 need this to do anything useful with LEDs. If unsure, say N. ··· 21 22 config LEDS_CORGI 23 tristate "LED Support for the Sharp SL-C7x0 series" 24 - depends LEDS_CLASS && PXA_SHARP_C7xx 25 help 26 This option enables support for the LEDs on Sharp Zaurus 27 SL-C7x0 series (C700, C750, C760, C860). 28 29 config LEDS_LOCOMO 30 tristate "LED Support for Locomo device" 31 - depends LEDS_CLASS && SHARP_LOCOMO 32 help 33 This option enables support for the LEDs on Sharp Locomo. 34 Zaurus models SL-5500 and SL-5600. 35 36 config LEDS_SPITZ 37 tristate "LED Support for the Sharp SL-Cxx00 series" 38 - depends LEDS_CLASS && PXA_SHARP_Cxx00 39 help 40 This option enables support for the LEDs on Sharp Zaurus 41 SL-Cxx00 series (C1000, C3000, C3100). 42 43 config LEDS_IXP4XX 44 tristate "LED Support for GPIO connected LEDs on IXP4XX processors" 45 - depends LEDS_CLASS && ARCH_IXP4XX 46 help 47 This option enables support for the LEDs connected to GPIO 48 outputs of the Intel IXP4XX processors. To be useful the ··· 51 52 config LEDS_TOSA 53 tristate "LED Support for the Sharp SL-6000 series" 54 - depends LEDS_CLASS && PXA_SHARPSL 55 help 56 This option enables support for the LEDs on Sharp Zaurus 57 SL-6000 series. ··· 65 66 config LEDS_AMS_DELTA 67 tristate "LED Support for the Amstrad Delta (E3)" 68 - depends LEDS_CLASS && MACH_AMS_DELTA 69 help 70 This option enables support for the LEDs on Amstrad Delta (E3). 71 ··· 86 87 config LEDS_TRIGGERS 88 bool "LED Trigger support" 89 - depends NEW_LEDS 90 help 91 This option enables trigger support for the leds class. 92 These triggers allow kernel events to drive the LEDs and can ··· 94 95 config LEDS_TRIGGER_TIMER 96 tristate "LED Timer Trigger" 97 - depends LEDS_TRIGGERS 98 help 99 This allows LEDs to be controlled by a programmable timer 100 via sysfs. If unsure, say Y. 101 102 config LEDS_TRIGGER_IDE_DISK 103 bool "LED IDE Disk Trigger" 104 - depends LEDS_TRIGGERS && BLK_DEV_IDEDISK 105 help 106 This allows LEDs to be controlled by IDE disk activity. 107 If unsure, say Y. 108 109 config LEDS_TRIGGER_HEARTBEAT 110 tristate "LED Heartbeat Trigger" 111 - depends LEDS_TRIGGERS 112 help 113 This allows LEDs to be controlled by a CPU load average. 114 The flash frequency is a hyperbolic function of the 1-minute
··· 12 13 config LEDS_CLASS 14 tristate "LED Class Support" 15 + depends on NEW_LEDS 16 help 17 This option enables the led sysfs class in /sys/class/leds. You'll 18 need this to do anything useful with LEDs. If unsure, say N. ··· 21 22 config LEDS_CORGI 23 tristate "LED Support for the Sharp SL-C7x0 series" 24 + depends on LEDS_CLASS && PXA_SHARP_C7xx 25 help 26 This option enables support for the LEDs on Sharp Zaurus 27 SL-C7x0 series (C700, C750, C760, C860). 28 29 config LEDS_LOCOMO 30 tristate "LED Support for Locomo device" 31 + depends on LEDS_CLASS && SHARP_LOCOMO 32 help 33 This option enables support for the LEDs on Sharp Locomo. 34 Zaurus models SL-5500 and SL-5600. 35 36 config LEDS_SPITZ 37 tristate "LED Support for the Sharp SL-Cxx00 series" 38 + depends on LEDS_CLASS && PXA_SHARP_Cxx00 39 help 40 This option enables support for the LEDs on Sharp Zaurus 41 SL-Cxx00 series (C1000, C3000, C3100). 42 43 config LEDS_IXP4XX 44 tristate "LED Support for GPIO connected LEDs on IXP4XX processors" 45 + depends on LEDS_CLASS && ARCH_IXP4XX 46 help 47 This option enables support for the LEDs connected to GPIO 48 outputs of the Intel IXP4XX processors. To be useful the ··· 51 52 config LEDS_TOSA 53 tristate "LED Support for the Sharp SL-6000 series" 54 + depends on LEDS_CLASS && PXA_SHARPSL 55 help 56 This option enables support for the LEDs on Sharp Zaurus 57 SL-6000 series. ··· 65 66 config LEDS_AMS_DELTA 67 tristate "LED Support for the Amstrad Delta (E3)" 68 + depends on LEDS_CLASS && MACH_AMS_DELTA 69 help 70 This option enables support for the LEDs on Amstrad Delta (E3). 71 ··· 86 87 config LEDS_TRIGGERS 88 bool "LED Trigger support" 89 + depends on NEW_LEDS 90 help 91 This option enables trigger support for the leds class. 92 These triggers allow kernel events to drive the LEDs and can ··· 94 95 config LEDS_TRIGGER_TIMER 96 tristate "LED Timer Trigger" 97 + depends on LEDS_TRIGGERS 98 help 99 This allows LEDs to be controlled by a programmable timer 100 via sysfs. If unsure, say Y. 101 102 config LEDS_TRIGGER_IDE_DISK 103 bool "LED IDE Disk Trigger" 104 + depends on LEDS_TRIGGERS && BLK_DEV_IDEDISK 105 help 106 This allows LEDs to be controlled by IDE disk activity. 107 If unsure, say Y. 108 109 config LEDS_TRIGGER_HEARTBEAT 110 tristate "LED Heartbeat Trigger" 111 + depends on LEDS_TRIGGERS 112 help 113 This allows LEDs to be controlled by a CPU load average. 114 The flash frequency is a hyperbolic function of the 1-minute
+2 -2
drivers/serial/Kconfig
··· 663 664 config V850E_UARTB 665 bool 666 - depends V850E_UART && V850E_ME2 667 default y 668 669 config V850E_UART_CONSOLE ··· 909 910 config SERIAL_TXX9 911 bool "TMPTX39XX/49XX SIO support" 912 - depends HAS_TXX9_SERIAL 913 select SERIAL_CORE 914 default y 915
··· 663 664 config V850E_UARTB 665 bool 666 + depends on V850E_UART && V850E_ME2 667 default y 668 669 config V850E_UART_CONSOLE ··· 909 910 config SERIAL_TXX9 911 bool "TMPTX39XX/49XX SIO support" 912 + depends on HAS_TXX9_SERIAL 913 select SERIAL_CORE 914 default y 915
+1 -1
fs/Kconfig
··· 1002 1003 config HUGETLBFS 1004 bool "HugeTLB file system support" 1005 - depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN 1006 help 1007 hugetlbfs is a filesystem backing for HugeTLB pages, based on 1008 ramfs. For architectures that support it, say Y here and read
··· 1002 1003 config HUGETLBFS 1004 bool "HugeTLB file system support" 1005 + depends on X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN 1006 help 1007 hugetlbfs is a filesystem backing for HugeTLB pages, based on 1008 ramfs. For architectures that support it, say Y here and read
+1 -1
sound/aoa/fabrics/Kconfig
··· 1 config SND_AOA_FABRIC_LAYOUT 2 tristate "layout-id fabric" 3 - depends SND_AOA 4 select SND_AOA_SOUNDBUS 5 select SND_AOA_SOUNDBUS_I2S 6 ---help---
··· 1 config SND_AOA_FABRIC_LAYOUT 2 tristate "layout-id fabric" 3 + depends on SND_AOA 4 select SND_AOA_SOUNDBUS 5 select SND_AOA_SOUNDBUS_I2S 6 ---help---