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