aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Miao <eric.y.miao@gmail.com>2010-03-16 05:30:15 -0400
committerEric Miao <eric.y.miao@gmail.com>2010-05-11 11:24:58 -0400
commit866d091dcb043594626d4facf7c6fcffcc7c8d35 (patch)
treecfd53e6b432ffea78ee34c7d14a90d335c4c6391
parent54c39b420f017c546fb130a05c14bdb0a7910f98 (diff)
[ARM] pxa: remove incorrect select PXA_SSP in Kconfig
PXA_SSP is actually used by drivers like drivers/spi/pxa2xx_spi.c and sound/soc/pxa/pxa-ssp.c, not by boards. Remove those incorrect 'select' from Kconfig and make SOC_PXA_SSP to select. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
-rw-r--r--arch/arm/mach-pxa/Kconfig13
-rw-r--r--sound/soc/pxa/Kconfig1
2 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 6dd450a7dea6..352dc4f3820c 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -19,7 +19,6 @@ config MACH_MAINSTONE
19config MACH_ZYLONITE 19config MACH_ZYLONITE
20 bool 20 bool
21 select PXA3xx 21 select PXA3xx
22 select PXA_SSP
23 select HAVE_PWM 22 select HAVE_PWM
24 select PXA_HAVE_BOARD_IRQS 23 select PXA_HAVE_BOARD_IRQS
25 24
@@ -39,7 +38,6 @@ config MACH_LITTLETON
39 select PXA3xx 38 select PXA3xx
40 select CPU_PXA300 39 select CPU_PXA300
41 select CPU_PXA310 40 select CPU_PXA310
42 select PXA_SSP
43 41
44config MACH_TAVOREVB 42config MACH_TAVOREVB
45 bool "PXA930 Evaluation Board (aka TavorEVB)" 43 bool "PXA930 Evaluation Board (aka TavorEVB)"
@@ -98,7 +96,6 @@ config MACH_ARMCORE
98 select PXA27x 96 select PXA27x
99 select IWMMXT 97 select IWMMXT
100 select PXA25x 98 select PXA25x
101 select PXA_SSP
102 99
103config MACH_EM_X270 100config MACH_EM_X270
104 bool "CompuLab EM-x270 platform" 101 bool "CompuLab EM-x270 platform"
@@ -161,7 +158,6 @@ config MACH_XCEP
161 select MTD_CFI 158 select MTD_CFI
162 select MTD_CHAR 159 select MTD_CHAR
163 select SMC91X 160 select SMC91X
164 select PXA_SSP
165 help 161 help
166 PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash. 162 PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.
167 Tuned for usage in Libera instruments for particle accelerators. 163 Tuned for usage in Libera instruments for particle accelerators.
@@ -180,7 +176,6 @@ config MACH_TRIZEPS4WL
180 depends on TRIZEPS_PXA 176 depends on TRIZEPS_PXA
181 select TRIZEPS_PCMCIA 177 select TRIZEPS_PCMCIA
182 select PXA27x 178 select PXA27x
183 select PXA_SSP
184 179
185choice 180choice
186 prompt "Select base board for Trizeps module" 181 prompt "Select base board for Trizeps module"
@@ -217,7 +212,6 @@ config MACH_PCM027
217 bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" 212 bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
218 select PXA27x 213 select PXA27x
219 select IWMMXT 214 select IWMMXT
220 select PXA_SSP
221 select PXA_HAVE_BOARD_IRQS 215 select PXA_HAVE_BOARD_IRQS
222 216
223config MACH_PCM990_BASEBOARD 217config MACH_PCM990_BASEBOARD
@@ -261,7 +255,6 @@ config MACH_H4700
261 bool "HP iPAQ hx4700" 255 bool "HP iPAQ hx4700"
262 select PXA27x 256 select PXA27x
263 select IWMMXT 257 select IWMMXT
264 select PXA_SSP
265 select HAVE_PWM 258 select HAVE_PWM
266 select PXA_HAVE_BOARD_IRQS 259 select PXA_HAVE_BOARD_IRQS
267 260
@@ -277,7 +270,6 @@ config MACH_MAGICIAN
277 bool "Enable HTC Magician Support" 270 bool "Enable HTC Magician Support"
278 select PXA27x 271 select PXA27x
279 select IWMMXT 272 select IWMMXT
280 select PXA_SSP
281 select HAVE_PWM 273 select HAVE_PWM
282 select PXA_HAVE_BOARD_IRQS 274 select PXA_HAVE_BOARD_IRQS
283 275
@@ -431,13 +423,11 @@ config MACH_RAUMFELD_CONNECTOR
431 bool "Raumfeld Connector" 423 bool "Raumfeld Connector"
432 select PXA3xx 424 select PXA3xx
433 select CPU_PXA300 425 select CPU_PXA300
434 select PXA_SSP
435 426
436config MACH_RAUMFELD_SPEAKER 427config MACH_RAUMFELD_SPEAKER
437 bool "Raumfeld Speaker" 428 bool "Raumfeld Speaker"
438 select PXA3xx 429 select PXA3xx
439 select CPU_PXA300 430 select CPU_PXA300
440 select PXA_SSP
441 431
442config PXA_SHARPSL 432config PXA_SHARPSL
443 bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models" 433 bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
@@ -466,7 +456,6 @@ config MACH_POODLE
466 depends on PXA_SHARPSL 456 depends on PXA_SHARPSL
467 select PXA25x 457 select PXA25x
468 select SHARP_LOCOMO 458 select SHARP_LOCOMO
469 select PXA_SSP
470 select PXA_HAVE_BOARD_IRQS 459 select PXA_HAVE_BOARD_IRQS
471 460
472config MACH_CORGI 461config MACH_CORGI
@@ -636,14 +625,12 @@ config CPU_PXA950
636 625
637config PXA_SHARP_C7xx 626config PXA_SHARP_C7xx
638 bool 627 bool
639 select PXA_SSP
640 select SHARPSL_PM 628 select SHARPSL_PM
641 help 629 help
642 Enable support for all Sharp C7xx models 630 Enable support for all Sharp C7xx models
643 631
644config PXA_SHARP_Cxx00 632config PXA_SHARP_Cxx00
645 bool 633 bool
646 select PXA_SSP
647 select SHARPSL_PM 634 select SHARPSL_PM
648 help 635 help
649 Enable common support for Sharp Cxx00 models 636 Enable common support for Sharp Cxx00 models
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 376e14a9c273..78e612100782 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -23,6 +23,7 @@ config SND_PXA2XX_SOC_I2S
23 23
24config SND_PXA_SOC_SSP 24config SND_PXA_SOC_SSP
25 tristate 25 tristate
26 select PXA_SSP
26 27
27config SND_PXA2XX_SOC_CORGI 28config SND_PXA2XX_SOC_CORGI
28 tristate "SoC Audio support for Sharp Zaurus SL-C7x0" 29 tristate "SoC Audio support for Sharp Zaurus SL-C7x0"