refresh 2.6.32 patches with -rc7

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

diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default
index be0a64f..96830ae 100644 (file)
--- a/target/linux/iop32x/config-default
+++ b/target/linux/iop32x/config-default
@@ -10,16 +10,14 @@ CONFIG_ARCH_IOP32X=y
 CONFIG_ARCH_SUPPORTS_AOUT=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
 # CONFIG_ARM_THUMB is not set
+CONFIG_ARM=y
 # CONFIG_ARPD is not set
 # CONFIG_ARTHUR is not set
 CONFIG_ASYNC_CORE=y
 CONFIG_ATA=m
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATM is not set
 # CONFIG_ATMEL is not set
-CONFIG_BASE_SMALL=0
+# CONFIG_ATM is not set
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -30,19 +28,18 @@ 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_CPU_32=y
 CONFIG_CPU_32v5=y
+CONFIG_CPU_32=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CP15=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
 # CONFIG_CRC_CCITT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEVPORT=y
 CONFIG_DLCI=m
@@ -52,11 +49,11 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DNOTIFY=y
 # CONFIG_DSCC4 is not set
-# CONFIG_E100 is not set
-CONFIG_E1000=y
-# CONFIG_E1000E_ENABLED is not set
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+# CONFIG_E1000E_ENABLED is not set
 CONFIG_E1000_NAPI=y
+CONFIG_E1000=y
+# CONFIG_E100 is not set
 # CONFIG_FARSYNC is not set
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
@@ -77,20 +74,20 @@ CONFIG_HAVE_IDE=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPROFILE=y
-CONFIG_HDLC=m
 CONFIG_HDLC_CISCO=m
 CONFIG_HDLC_FR=m
+CONFIG_HDLC=m
 CONFIG_HDLC_PPP=m
-CONFIG_HDLC_RAW=m
 # CONFIG_HDLC_RAW_ETH is not set
+CONFIG_HDLC_RAW=m
 # CONFIG_HERMES is not set
-CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_HWMON=y
 CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_IOP3XX is not set
+CONFIG_I2C=y
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INTEL_IOP_ADMA=y
@@ -103,8 +100,6 @@ CONFIG_INTEL_IOP_ADMA=y
 # CONFIG_IP6_NF_MATCH_OPTS is not set
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_TARGET_LOG is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_MROUTE=y
 # CONFIG_IP_NF_ARPTABLES is not set
@@ -120,19 +115,21 @@ CONFIG_IP_MROUTE=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_IWMMXT is not set
 # CONFIG_LANMEDIA is not set
-CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
 # CONFIG_LLC2 is not set
 CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
 # CONFIG_MACH_EM7210 is not set
 # CONFIG_MACH_GLANTANK is not set
 CONFIG_MACH_N2100=y
-CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
+CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -144,7 +141,6 @@ CONFIG_MEDIA_TUNER_XC5000=m
 # CONFIG_MINIX_FS is not set
 # CONFIG_MTD_CFI_AMDSTD is not set
 CONFIG_MTD_REDBOOT_PARTS=y
-# CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 CONFIG_NET_DMA=y
 # CONFIG_NET_EMATCH is not set
@@ -153,28 +149,25 @@ CONFIG_NET_DMA=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NO_IOPORT is not set
-# CONFIG_NVRAM is not set
 # CONFIG_OABI_COMPAT is not set
 # CONFIG_OCF_OCF is not set
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PC300 is not set
-CONFIG_PCI=y
 # CONFIG_PCI200SYN is not set
 # CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_SYSCALL=y
 CONFIG_PLAT_IOP=y
 # CONFIG_PPP is not set
 # CONFIG_PRISM54 is not set
 # CONFIG_R6040 is not set
-CONFIG_R8169=y
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y
+CONFIG_R8169=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RTC_DRV_X1205=y
@@ -185,14 +178,13 @@ CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TICK_ONESHOT is not set
 CONFIG_UID16=y
-CONFIG_USB=m
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_CATC is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_KAWETH is not set
+CONFIG_USB=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
@@ -216,8 +208,8 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WAN=y
 # CONFIG_WANXL is not set
+CONFIG_WAN=y
 # CONFIG_XFS_FS is not set
 # CONFIG_XIP_KERNEL is not set
 CONFIG_XSCALE_PMU=y