Merge tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / arch / arm / mach-exynos / Kconfig

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 4b8b9ec91ff48bdad9b6b43d28594bf939453c66..f22f69e2d081c4ab620068633b68e95029d7f97c 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -74,10 +74,12 @@ config SOC_EXYNOS5440
        bool "SAMSUNG EXYNOS5440"
        default y
        depends on ARCH_EXYNOS5
+       select ARCH_HAS_OPP
        select ARM_ARCH_TIMER
        select AUTO_ZRELADDR
        select PINCTRL
        select PINCTRL_EXYNOS5440
+       select PM_OPP
        help
          Enable EXYNOS5440 SoC support
 
@@ -110,11 +112,6 @@ config EXYNOS4_DEV_AHCI
        help
          Compile in platform device definitions for AHCI
 
-config EXYNOS_DEV_DRM
-       bool
-       help
-         Compile in platform device definitions for core DRM device
-
 config EXYNOS4_SETUP_FIMD0
        bool
        help
@@ -214,7 +211,6 @@ config MACH_SMDKV310
        select EXYNOS4_SETUP_SDHCI
        select EXYNOS4_SETUP_USB_PHY
        select EXYNOS_DEV_DMA
-       select EXYNOS_DEV_DRM
        select EXYNOS_DEV_SYSMMU
        select S3C24XX_PWM
        select S3C_DEV_HSMMC
@@ -268,9 +264,7 @@ config MACH_UNIVERSAL_C210
        select EXYNOS4_SETUP_SDHCI
        select EXYNOS4_SETUP_USB_PHY
        select EXYNOS_DEV_DMA
-       select EXYNOS_DEV_DRM
        select EXYNOS_DEV_SYSMMU
-       select HAVE_SCHED_CLOCK
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
@@ -309,7 +303,6 @@ config MACH_NURI
        select EXYNOS4_SETUP_SDHCI
        select EXYNOS4_SETUP_USB_PHY
        select EXYNOS_DEV_DMA
-       select EXYNOS_DEV_DRM
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
@@ -345,7 +338,6 @@ config MACH_ORIGEN
        select EXYNOS4_SETUP_SDHCI
        select EXYNOS4_SETUP_USB_PHY
        select EXYNOS_DEV_DMA
-       select EXYNOS_DEV_DRM
        select EXYNOS_DEV_SYSMMU
        select S3C24XX_PWM
        select S3C_DEV_HSMMC
@@ -381,7 +373,6 @@ config MACH_SMDK4212
        select EXYNOS4_SETUP_SDHCI
        select EXYNOS4_SETUP_USB_PHY
        select EXYNOS_DEV_DMA
-       select EXYNOS_DEV_DRM
        select EXYNOS_DEV_SYSMMU
        select S3C24XX_PWM
        select S3C_DEV_HSMMC2
@@ -424,7 +415,7 @@ config MACH_EXYNOS4_DT
        depends on ARCH_EXYNOS4
        select ARM_AMBA
        select CPU_EXYNOS4210
-       select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
+       select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
        select PINCTRL
        select PINCTRL_EXYNOS
        select USE_OF