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

[cascardo/linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b4935db..d7a71e3 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -113,9 +113,6 @@ config ARM_DMA_IOMMU_ALIGNMENT
 
 endif
 
-config HAVE_PWM
-       bool
-
 config MIGHT_HAVE_PCI
        bool
 
@@ -633,7 +630,6 @@ config ARCH_LPC32XX
        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
        select HAVE_IDE
-       select HAVE_PWM
        select USE_OF
        help
          Support for the NXP LPC32XX family of processors