Merge branch 'topic/drop-l3' into for-linus

[linux-2.6] / arch / arm / plat-s3c64xx / Kconfig

diff --git a/arch/arm/plat-s3c64xx/Kconfig b/arch/arm/plat-s3c64xx/Kconfig
index 9037eb4..54375a0 100644 (file)
--- a/arch/arm/plat-s3c64xx/Kconfig
+++ b/arch/arm/plat-s3c64xx/Kconfig
@@ -9,9 +9,10 @@
 config PLAT_S3C64XX
        bool
        depends on ARCH_S3C64XX
+       default y
+       select CPU_V6
        select PLAT_S3C
        select ARM_VIC
-       default y
        select NO_IOPORT
        select ARCH_REQUIRE_GPIOLIB
        select S3C_GPIO_TRACK
@@ -53,4 +54,9 @@ config S3C64XX_SETUP_I2C1
        help
          Common setup code for i2c bus 1.
 
+config S3C64XX_SETUP_FB_24BPP
+       bool
+       help
+         Common setup code for S3C64XX with an 24bpp RGB display helper.
+
 endif