Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

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

diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig
index b9ab1d5..bd294ad 100644 (file)
--- a/arch/arm/plat-mxc/devices/Kconfig
+++ b/arch/arm/plat-mxc/devices/Kconfig
@@ -24,7 +24,6 @@ config IMX_HAVE_PLATFORM_IMXDI_RTC
 
 config IMX_HAVE_PLATFORM_IMX_FB
        bool
-       select HAVE_FB_IMX
 
 config IMX_HAVE_PLATFORM_IMX_I2C
        bool
@@ -41,6 +40,9 @@ config IMX_HAVE_PLATFORM_IMX_UART
 config IMX_HAVE_PLATFORM_IMX_UDC
        bool
 
+config IMX_HAVE_PLATFORM_IPU_CORE
+       bool
+
 config IMX_HAVE_PLATFORM_MX1_CAMERA
        bool
 
@@ -63,6 +65,9 @@ config IMX_HAVE_PLATFORM_MXC_RNGA
        bool
        select ARCH_HAS_RNGA
 
+config IMX_HAVE_PLATFORM_MXC_RTC
+       bool
+
 config IMX_HAVE_PLATFORM_MXC_W1
        bool