diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-pxa/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/Makefile | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 17d3fbd368a3..47747f96f125 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
@@ -505,12 +505,6 @@ config PXA_SSP | |||
505 | help | 505 | help |
506 | Enable support for PXA2xx SSP ports | 506 | Enable support for PXA2xx SSP ports |
507 | 507 | ||
508 | config PXA_PWM | ||
509 | tristate | ||
510 | default BACKLIGHT_PWM | ||
511 | help | ||
512 | Enable support for PXA2xx/PXA3xx PWM controllers | ||
513 | |||
514 | config TOSA_BT | 508 | config TOSA_BT |
515 | tristate "Control the state of built-in bluetooth chip on Sharp SL-6000" | 509 | tristate "Control the state of built-in bluetooth chip on Sharp SL-6000" |
516 | depends on MACH_TOSA | 510 | depends on MACH_TOSA |
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 682dbf4e14b0..4bcebf72074a 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
@@ -15,7 +15,7 @@ endif | |||
15 | 15 | ||
16 | # Generic drivers that other drivers may depend upon | 16 | # Generic drivers that other drivers may depend upon |
17 | obj-$(CONFIG_PXA_SSP) += ssp.o | 17 | obj-$(CONFIG_PXA_SSP) += ssp.o |
18 | obj-$(CONFIG_PXA_PWM) += pwm.o | 18 | obj-$(CONFIG_HAVE_PWM) += pwm.o |
19 | 19 | ||
20 | # SoC-specific code | 20 | # SoC-specific code |
21 | obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa2xx.o pxa25x.o | 21 | obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa2xx.o pxa25x.o |