From cbe89f4e7f303c2474dc0891aceae055779833ca Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 24 Apr 2006 12:09:31 +0000 Subject: Merge 2.4 patches to 2.6 kernel. Update kernel config git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3704 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/target/linux/au1000-2.6/config | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'openwrt/target/linux/au1000-2.6/config') diff --git a/openwrt/target/linux/au1000-2.6/config b/openwrt/target/linux/au1000-2.6/config index bb7e267ad..aaf89b52c 100644 --- a/openwrt/target/linux/au1000-2.6/config +++ b/openwrt/target/linux/au1000-2.6/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.7 -# Sat Apr 22 16:46:55 2006 +# Sun Apr 23 13:43:59 2006 # CONFIG_MIPS=y @@ -676,7 +676,12 @@ CONFIG_NETDEVICES=y CONFIG_DUMMY=m CONFIG_BONDING=m # CONFIG_EQUALIZER is not set -# CONFIG_IMQ is not set +CONFIG_IMQ=m +# CONFIG_IMQ_BEHAVIOR_AA is not set +# CONFIG_IMQ_BEHAVIOR_AB is not set +CONFIG_IMQ_BEHAVIOR_BA=y +# CONFIG_IMQ_BEHAVIOR_BB is not set +CONFIG_IMQ_NUM_DEVS=2 CONFIG_TUN=m # @@ -875,17 +880,15 @@ CONFIG_MTX1_WATCHDOG=y # # PCI-based Watchdog Cards # -CONFIG_PCIPCWATCHDOG=m -CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set # # USB-based Watchdog Cards # # CONFIG_USBPCWATCHDOG is not set -CONFIG_RTC=m -CONFIG_GEN_RTC=m -CONFIG_GEN_RTC_X=y +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -1250,7 +1253,7 @@ CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set CONFIG_NFSD_V4=y CONFIG_NFSD_TCP=y -CONFIG_ROOT_NFS=y +# CONFIG_ROOT_NFS is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y -- cgit v1.2.3