[brcm63xx] backport an upstream fix: We're not disabling IRQ, so we must call the...

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

diff --git a/target/linux/s3c24xx/config-2.6.29 b/target/linux/s3c24xx/config-2.6.29
index 57d824d..3a7e323 100644 (file)
--- a/target/linux/s3c24xx/config-2.6.29
+++ b/target/linux/s3c24xx/config-2.6.29
@@ -43,8 +43,6 @@ CONFIG_CHARGER_PCF50606=y
 CONFIG_CHARGER_PCF50633=y
 CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
 CONFIG_COMPAT_BRK=y
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CPU_32=y
 CONFIG_CPU_32v4T=y
@@ -100,7 +98,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_S3C_UART=2
 # CONFIG_DEBUG_USER is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_DISPLAY_JBT6K74=y
 # CONFIG_DISPLAY_L1K002 is not set
@@ -163,7 +160,6 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_DEVICE=y
 CONFIG_GPIO_SYSFS=y
-# CONFIG_GREENASIA_FF is not set
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
@@ -230,7 +226,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
 CONFIG_INPUT_PCF50606_PMU=y
 CONFIG_INPUT_PCF50633_PMU=y
 CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_INPUT_YEALINK is not set
 CONFIG_IP_PNP=y
 # CONFIG_IP_PNP_BOOTP is not set
 # CONFIG_IP_PNP_DHCP is not set
@@ -263,7 +258,11 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT 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
@@ -285,7 +284,6 @@ CONFIG_MACH_SMDK=y
 # CONFIG_MACH_TCT_HAMMER is not set
 # CONFIG_MACH_VR1000 is not set
 # CONFIG_MACH_VSTMS is not set
-# CONFIG_MAC_PARTITION is not set
 CONFIG_MFD_GLAMO=y
 CONFIG_MFD_GLAMO_FB=y
 # CONFIG_MFD_GLAMO_FB_XGLAMO_WORKAROUND is not set
@@ -355,7 +353,6 @@ CONFIG_PCF50633_ADC=y
 CONFIG_PCF50633_GPIO=y
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PDA_POWER=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_PLAT_S3C=y
 CONFIG_PLAT_S3C24XX=y
 CONFIG_PM=y
@@ -438,7 +435,6 @@ CONFIG_SOUND=m
 CONFIG_SPI=y
 CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_GPIO_OLD is not set
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_S3C24XX=y
 CONFIG_SPI_S3C24XX_GPIO=y
@@ -451,8 +447,6 @@ CONFIG_SUSPEND_FREEZER=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
@@ -528,9 +522,7 @@ CONFIG_USB_S3C2410=y
 # CONFIG_USB_S3C2410_DEBUG is not set
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_CONSOLE=y
-# CONFIG_USB_SERIAL_OPTICON is not set
 CONFIG_USB_SERIAL_OPTION=y
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_ZERO is not set