Merge tag 'pwm/for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[cascardo/linux.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index a280cc4..e6690a4 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -7,7 +7,6 @@ comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
 config MACH_PXA3XX_DT
        bool "Support PXA3xx platforms from device tree"
        select CPU_PXA300
-       select HAVE_PWM
        select POWER_SUPPLY
        select PXA3xx
        select USE_OF
@@ -23,12 +22,10 @@ config ARCH_LUBBOCK
 
 config MACH_MAINSTONE
        bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"
-       select HAVE_PWM
        select PXA27x
 
 config MACH_ZYLONITE
        bool
-       select HAVE_PWM
        select PXA3xx
 
 config MACH_ZYLONITE300
@@ -123,7 +120,6 @@ config MACH_CM_X300
        bool "CompuLab CM-X300 modules"
        select CPU_PXA300
        select CPU_PXA310
-       select HAVE_PWM
        select PXA3xx
 
 config MACH_CAPC7117
@@ -214,7 +210,6 @@ config TRIZEPS_PCMCIA
 
 config MACH_LOGICPD_PXA270
        bool "LogicPD PXA270 Card Engine Development Platform"
-       select HAVE_PWM
        select PXA27x
 
 config MACH_PCM027
@@ -225,7 +220,6 @@ config MACH_PCM027
 config MACH_PCM990_BASEBOARD
        bool "PHYTEC PCM-990 development board"
        depends on MACH_PCM027
-       select HAVE_PWM
 
 choice
        prompt "display on pcm990"
@@ -249,7 +243,6 @@ config MACH_COLIBRI
 config MACH_COLIBRI_PXA270_INCOME
        bool "Income s.r.o. PXA270 SBC"
        depends on MACH_COLIBRI
-       select HAVE_PWM
        select PXA27x
 
 config MACH_COLIBRI300
@@ -278,7 +271,6 @@ comment "End-user Products (sorted by vendor name)"
 
 config MACH_H4700
        bool "HP iPAQ hx4700"
-       select HAVE_PWM
        select IWMMXT
        select PXA27x
 
@@ -292,14 +284,12 @@ config MACH_HIMALAYA
 
 config MACH_MAGICIAN
        bool "Enable HTC Magician Support"
-       select HAVE_PWM
        select IWMMXT
        select PXA27x
 
 config MACH_MIOA701
        bool "Mitac Mio A701 Support"
        select GPIO_SYSFS
-       select HAVE_PWM
        select IWMMXT
        select PXA27x
        help
@@ -309,7 +299,6 @@ config MACH_MIOA701
 
 config PXA_EZX
        bool "Motorola EZX Platform"
-       select HAVE_PWM
        select IWMMXT
        select PXA27x
 
@@ -349,7 +338,6 @@ config MACH_MP900C
 
 config ARCH_PXA_PALM
        bool "PXA based Palm PDAs"
-       select HAVE_PWM
 
 config MACH_PALM27X
        bool
@@ -447,7 +435,6 @@ config MACH_TREO680
 config MACH_RAUMFELD_RC
        bool "Raumfeld Controller"
        select CPU_PXA300
-       select HAVE_PWM
        select POWER_SUPPLY
        select PXA3xx
 
@@ -611,7 +598,6 @@ config MACH_E800
 
 config MACH_ZIPIT2
        bool "Zipit Z2 Handheld"
-       select HAVE_PWM
        select PXA27x
 endmenu