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