aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2008-05-31 11:14:48 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-06-02 14:33:35 -0400
commit69eaf23a9797e1bdf16e210ef4da3e756a41f4de (patch)
tree88715ee63596c1ab7a0ad90268de2a5450817361
parent5806d8abf6b152f23d057c2e6b9199892883a8df (diff)
[ARM] 5071/2: Drop PXA_SHARPSL_25x/27x case from PXA Kconfig.
As nothing in the code references to the PXA_SHARPSL_25x/27x, we can drop that Kconfig case and permit all-zaurus builds. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-pxa/Kconfig41
1 files changed, 16 insertions, 25 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 2563753fba76..caccbbc41b43 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -148,23 +148,6 @@ config MACH_PCM990_BASEBOARD
148 148
149endchoice 149endchoice
150 150
151if PXA_SHARPSL
152
153choice
154 prompt "Select target Sharp Zaurus device range"
155
156config PXA_SHARPSL_25x
157 bool "Sharp PXA25x models (SL-5600, SL-C7xx and SL-C6000x)"
158 select PXA25x
159
160config PXA_SHARPSL_27x
161 bool "Sharp PXA270 models (SL-Cxx00)"
162 select PXA27x
163
164endchoice
165
166endif
167
168if ARCH_GUMSTIX 151if ARCH_GUMSTIX
169 152
170choice 153choice
@@ -198,28 +181,33 @@ endmenu
198 181
199config MACH_POODLE 182config MACH_POODLE
200 bool "Enable Sharp SL-5600 (Poodle) Support" 183 bool "Enable Sharp SL-5600 (Poodle) Support"
201 depends on PXA_SHARPSL_25x 184 depends on PXA_SHARPSL
185 select PXA25x
202 select SHARP_LOCOMO 186 select SHARP_LOCOMO
203 select PXA_SSP 187 select PXA_SSP
204 188
205config MACH_CORGI 189config MACH_CORGI
206 bool "Enable Sharp SL-C700 (Corgi) Support" 190 bool "Enable Sharp SL-C700 (Corgi) Support"
207 depends on PXA_SHARPSL_25x 191 depends on PXA_SHARPSL
192 select PXA25x
208 select PXA_SHARP_C7xx 193 select PXA_SHARP_C7xx
209 194
210config MACH_SHEPHERD 195config MACH_SHEPHERD
211 bool "Enable Sharp SL-C750 (Shepherd) Support" 196 bool "Enable Sharp SL-C750 (Shepherd) Support"
212 depends on PXA_SHARPSL_25x 197 depends on PXA_SHARPSL
198 select PXA25x
213 select PXA_SHARP_C7xx 199 select PXA_SHARP_C7xx
214 200
215config MACH_HUSKY 201config MACH_HUSKY
216 bool "Enable Sharp SL-C760 (Husky) Support" 202 bool "Enable Sharp SL-C760 (Husky) Support"
217 depends on PXA_SHARPSL_25x 203 depends on PXA_SHARPSL
204 select PXA25x
218 select PXA_SHARP_C7xx 205 select PXA_SHARP_C7xx
219 206
220config MACH_AKITA 207config MACH_AKITA
221 bool "Enable Sharp SL-1000 (Akita) Support" 208 bool "Enable Sharp SL-1000 (Akita) Support"
222 depends on PXA_SHARPSL_27x 209 depends on PXA_SHARPSL
210 select PXA27x
223 select PXA_SHARP_Cxx00 211 select PXA_SHARP_Cxx00
224 select MACH_SPITZ 212 select MACH_SPITZ
225 select I2C 213 select I2C
@@ -227,17 +215,20 @@ config MACH_AKITA
227 215
228config MACH_SPITZ 216config MACH_SPITZ
229 bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" 217 bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
230 depends on PXA_SHARPSL_27x 218 depends on PXA_SHARPSL
219 select PXA27x
231 select PXA_SHARP_Cxx00 220 select PXA_SHARP_Cxx00
232 221
233config MACH_BORZOI 222config MACH_BORZOI
234 bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" 223 bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
235 depends on PXA_SHARPSL_27x 224 depends on PXA_SHARPSL
225 select PXA27x
236 select PXA_SHARP_Cxx00 226 select PXA_SHARP_Cxx00
237 227
238config MACH_TOSA 228config MACH_TOSA
239 bool "Enable Sharp SL-6000x (Tosa) Support" 229 bool "Enable Sharp SL-6000x (Tosa) Support"
240 depends on PXA_SHARPSL_25x 230 depends on PXA_SHARPSL
231 select PXA25x
241 232
242config PXA25x 233config PXA25x
243 bool 234 bool