[ar71xx] sync kernel config

[openwrt.git] / target / linux / s3c24xx / config-2.6.30

diff --git a/target/linux/s3c24xx/config-2.6.30 b/target/linux/s3c24xx/config-2.6.30
index a69baf9..b28237d 100644 (file)
--- a/target/linux/s3c24xx/config-2.6.30
+++ b/target/linux/s3c24xx/config-2.6.30
@@ -176,8 +176,6 @@ CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_S3C2410=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_S3C2410=y

-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y

 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INITRAMFS_SOURCE=""


@@ -212,7 +210,12 @@ CONFIG_KEYBOARD_GTA02=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set

-# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_PLATFORM is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set

 # CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_GTA02=y
 CONFIG_LEDS_GTA02_VIBRATOR=y
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_GTA02=y
 CONFIG_LEDS_GTA02_VIBRATOR=y


@@ -221,7 +224,11 @@ CONFIG_LEDS_GTA02_VIBRATOR=y
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LOCK_KERNEL=y
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LOCK_KERNEL=y

-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_OPENWRT_CLUT224=y

 CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_MACH_AML_M5900 is not set
 # CONFIG_MACH_ANUBIS is not set
 CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_MACH_AML_M5900 is not set
 # CONFIG_MACH_ANUBIS is not set


@@ -254,7 +261,7 @@ CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_MMC_DEBUG is not set

-# CONFIG_MMC_S3C is not set
+CONFIG_MMC_S3C=y

 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_SPI is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_SPI is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set


@@ -303,9 +310,6 @@ CONFIG_RD_GZIP=y
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_PCF50633=y
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_PCF50633=y

-CONFIG_RFKILL=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_LEDS=y

 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DRV_CMOS is not set
 CONFIG_RTC_DRV_PCF50633=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DRV_CMOS is not set
 CONFIG_RTC_DRV_PCF50633=y