upgrade iop32x to 2.6.30

[openwrt.git] / target / linux / ixp4xx / config-default

diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default
index 895a8f8..d1e1656 100644 (file)
--- a/target/linux/ixp4xx/config-default
+++ b/target/linux/ixp4xx/config-default
@@ -35,7 +35,6 @@ CONFIG_BOUNCE=y
 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"

-# CONFIG_CONFIGFS_FS is not set

 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y


@@ -50,13 +49,8 @@ CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y

-# CONFIG_CRYPTO_DEV_IXP4XX is not set
-CONFIG_CRYPTO_HW=y

 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set

-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y

 CONFIG_DEVPORT=y
 CONFIG_DLCI=m
 CONFIG_DLCI_MAX=8
 CONFIG_DEVPORT=y
 CONFIG_DLCI=m
 CONFIG_DLCI_MAX=8


@@ -108,10 +102,6 @@ CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_GPIO=y
 # CONFIG_I2C_IOP3XX is not set
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_GPIO=y
 # CONFIG_I2C_IOP3XX is not set

-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set

 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=m
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=m


@@ -178,7 +168,6 @@ CONFIG_MACH_USR8200=y
 CONFIG_MACH_WG302V1=y
 CONFIG_MACH_WG302V2=y
 CONFIG_MACH_WRT300NV2=y
 CONFIG_MACH_WG302V1=y
 CONFIG_MACH_WG302V2=y
 CONFIG_MACH_WRT300NV2=y

-# CONFIG_MAC_PARTITION is not set

 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_SIMPLE=m


@@ -219,7 +208,6 @@ CONFIG_PCI=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PRISM54 is not set
 # CONFIG_R6040 is not set
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PRISM54 is not set
 # CONFIG_R6040 is not set

-CONFIG_RFKILL_LEDS=y

 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_RTC_DRV_ISL1208=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_RTC_DRV_ISL1208=y


@@ -234,19 +222,10 @@ CONFIG_SENSORS_W83781D=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4

-# CONFIG_SHMEM is not set

 # CONFIG_SMC91X is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_SMC91X is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-CONFIG_TCP_CONG_VEGAS=m
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y

 CONFIG_TICK_ONESHOT=y
 CONFIG_TICK_ONESHOT=y

-CONFIG_TINY_SHMEM=y

 CONFIG_UID16=y
 CONFIG_USB=m
 CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
 CONFIG_UID16=y
 CONFIG_USB=m
 CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y


@@ -266,8 +245,6 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIA_VELOCITY=m
 CONFIG_VIDEO_MEDIA=m
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIA_VELOCITY=m
 CONFIG_VIDEO_MEDIA=m

-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_COMMON=m

 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WAN=y
 # CONFIG_WANXL is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WAN=y
 # CONFIG_WANXL is not set