Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / arm / plat-s5p / Kconfig

diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index e98f5c5..9a197e5 100644 (file)
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -22,7 +22,6 @@ config PLAT_S5P
        select PLAT_SAMSUNG
        select SAMSUNG_CLKSRC
        select SAMSUNG_IRQ_VIC_TIMER
-       select SAMSUNG_IRQ_UART
        help
          Base platform code for Samsung's S5P series SoC.
 
@@ -39,6 +38,7 @@ config S5P_GPIO_INT
 
 config S5P_HRT
        bool
+       select SAMSUNG_DEV_PWM
        help
          Use the High Resolution timer support
 
@@ -70,6 +70,16 @@ config S5P_DEV_FIMC3
        help
          Compile in platform device definitions for FIMC controller 3
 
+config S5P_DEV_FIMD0
+       bool
+       help
+         Compile in platform device definitions for FIMD controller 0
+
+config S5P_DEV_MFC
+       bool
+       help
+         Compile in platform device definitions for MFC
+
 config S5P_DEV_ONENAND
        bool
        help