[adm5120] do not overrid CONFIG_BRIDGE (#5163)

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

diff --git a/target/linux/s3c24xx/config-2.6.28 b/target/linux/s3c24xx/config-2.6.28
index 4df78f6..67da70d 100644 (file)
--- a/target/linux/s3c24xx/config-2.6.28
+++ b/target/linux/s3c24xx/config-2.6.28
@@ -11,56 +11,20 @@ CONFIG_ANDROID_POWER_STAT=y
 CONFIG_APM_EMULATION=y
 CONFIG_APM_POWER=y
 CONFIG_AR6000_WLAN=y
 CONFIG_APM_EMULATION=y
 CONFIG_APM_POWER=y
 CONFIG_AR6000_WLAN=y

-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set

 # CONFIG_ARCH_BAST is not set
 # CONFIG_ARCH_BAST is not set

-# CONFIG_ARCH_CLPS711X is not set

 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CLPS7500 is not set

-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set

 CONFIG_ARCH_FLATMEM_HAS_HOLES=y
 CONFIG_ARCH_FLATMEM_HAS_HOLES=y

-# CONFIG_ARCH_FOOTBRIDGE is not set

 # CONFIG_ARCH_H1940 is not set
 # CONFIG_ARCH_H1940 is not set

-# CONFIG_ARCH_H720X is not set

 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set

-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set

 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y

-# CONFIG_ARCH_RPC is not set

 CONFIG_ARCH_S3C2410=y
 CONFIG_ARCH_S3C2440=y
 CONFIG_ARCH_S3C2410=y
 CONFIG_ARCH_S3C2440=y

-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_SA1100 is not set

 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

-# CONFIG_ARCH_SHARK is not set

 # CONFIG_ARCH_SMDK2410 is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_SMDK2410 is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y

-# CONFIG_ARCH_VERSATILE is not set

 CONFIG_ARM=y
 CONFIG_ARM_THUMB=y
 # CONFIG_ARPD is not set
 CONFIG_ARM=y
 CONFIG_ARM_THUMB=y
 # CONFIG_ARPD is not set


@@ -88,7 +52,6 @@ CONFIG_CHARGER_PCF50633=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
 CONFIG_COMPAT_BRK=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
 CONFIG_COMPAT_BRK=y

-# CONFIG_CONFIGFS_FS is not set

 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CPU_32=y
 CONFIG_CPU_32v4T=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CPU_32=y
 CONFIG_CPU_32v4T=y


@@ -143,7 +106,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_S3C_UART=2
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_S3C_UART=2
 # CONFIG_DEBUG_USER is not set

-CONFIG_DEFAULT_TCP_CONG="cubic"

 CONFIG_DISPLAY_JBT6K74=y
 CONFIG_DISPLAY_SUPPORT=y
 CONFIG_DMADEVICES=y
 CONFIG_DISPLAY_JBT6K74=y
 CONFIG_DISPLAY_SUPPORT=y
 CONFIG_DMADEVICES=y


@@ -289,14 +251,12 @@ CONFIG_KEYBOARD_QT2410=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_KMOD=y

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

-# CONFIG_LEDS_ALIX is not set

 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_NEO1973_GTA02=y
 CONFIG_LEDS_NEO1973_VIBRATOR=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_NEO1973_GTA02=y
 CONFIG_LEDS_NEO1973_VIBRATOR=y


@@ -328,7 +288,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_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_MARKERS=y
 CONFIG_MFD_GLAMO=y
 CONFIG_MFD_GLAMO_FB=y
 CONFIG_MARKERS=y
 CONFIG_MFD_GLAMO=y
 CONFIG_MFD_GLAMO_FB=y


@@ -389,7 +348,6 @@ CONFIG_PCF50633_ADC=y
 CONFIG_PCF50633_GPIO=y
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PDA_POWER=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
 CONFIG_PLAT_S3C=y
 CONFIG_PLAT_S3C24XX=y
 CONFIG_PM=y


@@ -408,33 +366,9 @@ CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DEBUG=y
 # CONFIG_RTC_DRV_CMOS is not set
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DEBUG=y
 # CONFIG_RTC_DRV_CMOS is not set

-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set

 # CONFIG_RTC_DRV_PCF50606 is not set
 CONFIG_RTC_DRV_PCF50633=y
 # CONFIG_RTC_DRV_PCF50606 is not set
 CONFIG_RTC_DRV_PCF50633=y

-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set

 CONFIG_RTC_DRV_S3C=y
 CONFIG_RTC_DRV_S3C=y

-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y

 CONFIG_S3C2410_CLOCK=y
 CONFIG_S3C2410_DMA=y
 # CONFIG_S3C2410_DMA_DEBUG is not set
 CONFIG_S3C2410_CLOCK=y
 CONFIG_S3C2410_DMA=y
 # CONFIG_S3C2410_DMA_DEBUG is not set


@@ -457,7 +391,6 @@ CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_PROC_FS is not set
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_PROC_FS is not set

-CONFIG_SCSI_WAIT_SCAN=m

 # CONFIG_SDIO_UART is not set
 # CONFIG_SENSORS_PCF50606 is not set
 # CONFIG_SENSORS_PCF50633 is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SENSORS_PCF50606 is not set
 # CONFIG_SENSORS_PCF50633 is not set


@@ -487,28 +420,22 @@ CONFIG_SND_SOC_WM8753=m
 CONFIG_SND_TIMER=m
 # CONFIG_SND_USB is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
 CONFIG_SND_TIMER=m
 # CONFIG_SND_USB is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set

-# CONFIG_SOFT_WATCHDOG is not set

 CONFIG_SOUND=m
 # CONFIG_SOUND_OSS_CORE is not set
 CONFIG_SPI=y
 CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_GPIO is not set
 CONFIG_SOUND=m
 # CONFIG_SOUND_OSS_CORE is not set
 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
 # CONFIG_SPI_SPIDEV is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_S3C24XX=y
 CONFIG_SPI_S3C24XX_GPIO=y
 # CONFIG_SPI_SPIDEV is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096

-CONFIG_SSB_POSSIBLE=y

 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y

-CONFIG_SYSVIPC_SYSCTL=y

 CONFIG_SYS_SUPPORTS_APM_EMULATION=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
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_ELO is not set