Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / blackfin / Kconfig

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 7e3a24c..ec44fc6 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -1002,16 +1002,6 @@ config BFIN_GPTIMERS
          To compile this driver as a module, choose M here: the module
          will be called gptimers.
 
-config HAVE_PWM
-       tristate "Enable PWM API support"
-       depends on BFIN_GPTIMERS
-       help
-         Enable support for the Pulse Width Modulation framework (as
-         found in linux/pwm.h).
-
-         To compile this driver as a module, choose M here: the module
-         will be called pwm.
-
 choice
        prompt "Uncached DMA region"
        default DMA_UNCACHED_1M
@@ -1050,7 +1040,7 @@ config BFIN_EXTMEM_ICACHEABLE
 config BFIN_L2_ICACHEABLE
        bool "Enable ICACHE for L2 SRAM"
        depends on BFIN_ICACHE
-       depends on BF54x || BF561
+       depends on (BF54x || BF561 || BF60x) && !SMP
        default n
 
 config BFIN_DCACHE