From 0a72d14e409a42bf67e264b05c7daf4b3f103d14 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 11 Feb 2008 15:28:45 +0000 Subject: [PATCH] resync kernel config SVN-Revision: 10444 --- .../{config-2.6.22 => config-default} | 45 +++++-------------- 1 file changed, 11 insertions(+), 34 deletions(-) rename target/linux/brcm63xx/{config-2.6.22 => config-default} (87%) diff --git a/target/linux/brcm63xx/config-2.6.22 b/target/linux/brcm63xx/config-default similarity index 87% rename from target/linux/brcm63xx/config-2.6.22 rename to target/linux/brcm63xx/config-default index 4a3cdb7196b..4d73f5bb982 100644 --- a/target/linux/brcm63xx/config-2.6.22 +++ b/target/linux/brcm63xx/config-default @@ -4,6 +4,7 @@ CONFIG_32BIT=y # CONFIG_8139TOO is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_ATM_DRIVERS=y CONFIG_AUDIT=y CONFIG_AUDIT_GENERIC=y @@ -60,6 +61,7 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DEFAULT_TCP_CONG="bic" # CONFIG_DEFAULT_VEGAS is not set +CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y @@ -79,9 +81,9 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set # CONFIG_GEN_RTC is not set # CONFIG_HAMRADIO is not set +CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y -CONFIG_HID=m CONFIG_HWMON=y # CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_HW_HAS_PCI=y @@ -91,9 +93,9 @@ CONFIG_HZ=250 CONFIG_HZ_250=y # CONFIG_I2C is not set # CONFIG_IDE is not set +CONFIG_INITRAMFS_SOURCE="" CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y -# CONFIG_INPUT is not set CONFIG_IOSCHED_CFQ=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IP6_NF_MATCH_FRAG is not set @@ -112,15 +114,8 @@ CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_IP_SCTP=m CONFIG_IRQ_CPU=y -# CONFIG_JFS_FS is not set CONFIG_KALLSYMS=y CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_KEYBOARD_ATKBD=m -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_NEWTON 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_LBD=y # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set @@ -131,44 +126,27 @@ CONFIG_LXT_PHY=m # CONFIG_MACH_JAZZ is not set # CONFIG_MACH_VR41XX is not set # CONFIG_MAC_PARTITION is not set -# CONFIG_MAC80211_DEBUGFS is not set CONFIG_MAGIC_SYSRQ=y CONFIG_MARVELL_PHY=m CONFIG_MII=m # CONFIG_MINIX_FS is not set CONFIG_MIPS=y # CONFIG_MIPS_ATLAS is not set -# CONFIG_MIPS_BOSPORUS is not set # CONFIG_MIPS_COBALT is not set -# CONFIG_MIPS_DB1000 is not set -# CONFIG_MIPS_DB1100 is not set -# CONFIG_MIPS_DB1200 is not set -# CONFIG_MIPS_DB1500 is not set -# CONFIG_MIPS_DB1550 is not set # CONFIG_MIPS_EV64120 is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_MIPS_MALTA is not set -# CONFIG_MIPS_MIRAGE is not set -# CONFIG_MIPS_MTX1 is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set # CONFIG_MIPS_MT_SMTC is not set -# CONFIG_MIPS_PB1000 is not set -# CONFIG_MIPS_PB1100 is not set -# CONFIG_MIPS_PB1200 is not set -# CONFIG_MIPS_PB1500 is not set -# CONFIG_MIPS_PB1550 is not set # CONFIG_MIPS_SEAD is not set # CONFIG_MIPS_SIM is not set # CONFIG_MIPS_VPE_LOADER is not set -# CONFIG_MIPS_XXS1500 is not set CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y -# CONFIG_MOMENCO_JAGUAR_ATX is not set # CONFIG_MOMENCO_OCELOT is not set # CONFIG_MOMENCO_OCELOT_3 is not set # CONFIG_MOMENCO_OCELOT_C is not set -# CONFIG_MOMENCO_OCELOT_G is not set CONFIG_MTD=y # CONFIG_MTD_ABSENT is not set CONFIG_MTD_BCM963XX=y @@ -207,7 +185,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set # CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set # CONFIG_MTD_ONENAND is not set # CONFIG_MTD_OTP is not set CONFIG_MTD_PARTITIONS=y @@ -224,11 +201,11 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y # CONFIG_MTD_SLRAM is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set -CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y -# CONFIG_NET_SCH_CLK_JIFFIES is not set +# CONFIG_NETDEV_1000 is not set CONFIG_NET_SCH_FIFO=y # CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NETDEV_1000 is not set +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_GRE=m CONFIG_NLS=y CONFIG_NLS_ASCII=m # CONFIG_PAGE_SIZE_16KB is not set @@ -243,11 +220,11 @@ CONFIG_PHYLIB=m CONFIG_POSIX_MQUEUE=y CONFIG_QSEMI_PHY=m CONFIG_RELAY=y -# CONFIG_ROMFS_FS is not set # CONFIG_RTC is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y # CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set CONFIG_SCTP_HMAC_MD5=y @@ -273,7 +250,6 @@ CONFIG_SHAPER=m # CONFIG_SIBYTE_RHONE is not set # CONFIG_SIBYTE_SENTOSA is not set # CONFIG_SIBYTE_SWARM is not set -# CONFIG_SMB_FS is not set # CONFIG_SMSC_PHY is not set # CONFIG_SOUND is not set # CONFIG_SPARSEMEM_STATIC is not set @@ -290,7 +266,7 @@ CONFIG_TCP_CONG_BIC=y # 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 is not set +CONFIG_TCP_CONG_VEGAS=m # CONFIG_TCP_CONG_VENO is not set CONFIG_TIPC=m # CONFIG_TIPC_ADVANCED is not set @@ -301,10 +277,11 @@ CONFIG_TIPC=m CONFIG_TRAD_SIGNALS=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_USB_EHCI_HCD is not set -# CONFIG_USB_GTCO is not set # CONFIG_USB_UHCI_HCD is not set +# CONFIG_VGASTATE is not set # CONFIG_VIA_RHINE is not set CONFIG_VLAN_8021Q=m CONFIG_VM_EVENT_COUNTERS=y CONFIG_WAN_ROUTER=m # CONFIG_WATCHDOG is not set +CONFIG_ZONE_DMA_FLAG=0 -- 2.30.2