From: Gabor Juhos Date: Sun, 26 Apr 2009 04:57:14 +0000 (+0000) Subject: resync 2.6.28 config X-Git-Tag: reboot~23860 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d56fcbd853f7ac82712c4d0e2a670fd82f39da4f;p=openwrt%2Fstaging%2Flynxis.git resync 2.6.28 config SVN-Revision: 15418 --- diff --git a/target/linux/adm5120/router_be/config-2.6.28 b/target/linux/adm5120/router_be/config-2.6.28 index 893e59be91..f5f83109bb 100644 --- a/target/linux/adm5120/router_be/config-2.6.28 +++ b/target/linux/adm5120/router_be/config-2.6.28 @@ -22,17 +22,10 @@ CONFIG_ARCH_SUPPORTS_OPROFILE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARM_AMBA=y CONFIG_BASE_SMALL=0 -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCM47XX is not set CONFIG_BINFMT_MISC=m CONFIG_BITREVERSE=y CONFIG_CEVT_R4K=y -CONFIG_CIFS_DEBUG2=y -CONFIG_CIFS_EXPERIMENTAL=y -CONFIG_CIFS_STATS2=y -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_CIFS_XATTR=y CONFIG_CLASSIC_RCU=y CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 init=/etc/preinit" CONFIG_CPU_BIG_ENDIAN=y @@ -65,12 +58,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_VR41XX is not set -CONFIG_CRYPTO_AEAD2=m -CONFIG_CRYPTO_ALGAPI2=m -CONFIG_CRYPTO_BLKCIPHER2=m -CONFIG_CRYPTO_HASH2=m -CONFIG_CRYPTO_MANAGER2=m -CONFIG_CRYPTO_RNG2=m CONFIG_CSRC_R4K=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set @@ -78,12 +65,8 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y CONFIG_EARLY_PRINTK=y CONFIG_ELF_CORE=y -# CONFIG_EXT3_FS_POSIX_ACL is not set -# CONFIG_EXT3_FS_SECURITY is not set -CONFIG_EXT3_FS_XATTR=y CONFIG_FIRMWARE_IN_KERNEL=y # CONFIG_FREEZER is not set -CONFIG_FS_MBCACHE=m CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_ACL=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -104,26 +87,7 @@ CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_IDE=y CONFIG_HAVE_OPROFILE=y CONFIG_HID=m -CONFIG_HID_A4TECH=m -CONFIG_HID_APPLE=m -CONFIG_HID_BELKIN=m -CONFIG_HID_BRIGHT=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m CONFIG_HID_COMPAT=y -CONFIG_HID_CYPRESS=m -CONFIG_HID_DELL=m -CONFIG_HID_EZKEY=m -CONFIG_HID_GYRATION=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_PANTHERLORD=m -CONFIG_HID_PETALYNX=m -# CONFIG_HID_PID is not set -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SUNPLUS=m CONFIG_HID_SUPPORT=y CONFIG_HW_HAS_PCI=y CONFIG_HW_RANDOM=y @@ -135,19 +99,12 @@ CONFIG_HZ_250=y # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set # CONFIG_IDE is not set -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_INITRAMFS_SOURCE="" CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_INPUT=m -# CONFIG_INPUT_EVDEV is not set -CONFIG_IPV6_MIP6=m -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IRQ_CPU=y # CONFIG_ISDN is not set -# CONFIG_JOLIET is not set CONFIG_KMOD=y # CONFIG_LEDS_ALIX is not set CONFIG_LEDS_GPIO=m @@ -155,8 +112,6 @@ CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_LEMOTE_FULONG is not set -# CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_EMMA is not set @@ -168,7 +123,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_MFD_TMIO is not set CONFIG_MII=m # CONFIG_MIKROTIK_RB532 is not set -# CONFIG_MINIX_FS is not set CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 @@ -222,9 +176,7 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_SLRAM is not set CONFIG_MTD_TRXSPLIT=y # CONFIG_NET_PCI is not set -# CONFIG_NET_PKTGEN is not set -CONFIG_NF_CT_ACCT=y -CONFIG_NF_DEFRAG_IPV4=m +# CONFIG_NF_DEFRAG_IPV4 is not set # CONFIG_NO_IOPORT is not set # CONFIG_NXP_STB220 is not set # CONFIG_NXP_STB225 is not set @@ -233,7 +185,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_8KB is not set -# CONFIG_PANTHERLORD_FF is not set # CONFIG_PARTITION_ADVANCED is not set CONFIG_PCI=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y @@ -246,11 +197,10 @@ CONFIG_PCI_DOMAINS=y # CONFIG_PNX8550_STB810 is not set # CONFIG_PROBE_INITRD_HEADER is not set # CONFIG_PROM_EMU is not set -CONFIG_RFKILL_LEDS=y CONFIG_RTC_LIB=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -CONFIG_SCSI_WAIT_SCAN=m +# CONFIG_SCSI_DMA is not set # CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_AMBA_PL010=y CONFIG_SERIAL_AMBA_PL010_CONSOLE=y @@ -278,11 +228,8 @@ CONFIG_SERIO_SERPORT=y # CONFIG_SIBYTE_SWARM is not set # CONFIG_SLAB is not set CONFIG_SLUB=y -CONFIG_SND_MIPS=y CONFIG_SOFT_WATCHDOG=m -CONFIG_SOUND_OSS_CORE=y CONFIG_SSB_POSSIBLE=y -# CONFIG_SUNRPC_REGISTER_V4 is not set CONFIG_SWAP_IO_SPACE=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y @@ -291,7 +238,6 @@ CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y -# CONFIG_THRUSTMASTER_FF is not set CONFIG_TICK_ONESHOT=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TRAD_SIGNALS=y @@ -299,17 +245,11 @@ CONFIG_USB=m CONFIG_USB_ADM5120_HCD=m CONFIG_USB_DEBUG=y CONFIG_USB_EHCI_HCD=m -# CONFIG_USB_NET_SMSC95XX is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD=m CONFIG_USB_SUPPORT=y # CONFIG_USB_UHCI_HCD is not set # CONFIG_VGASTATE is not set -CONFIG_VIDEO_MEDIA=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_W1_SLAVE_BQ27000 is not set -# CONFIG_ZEROPLUS_FF is not set CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/adm5120/router_le/config-2.6.28 b/target/linux/adm5120/router_le/config-2.6.28 index 88f99d67a9..425c1044dc 100644 --- a/target/linux/adm5120/router_le/config-2.6.28 +++ b/target/linux/adm5120/router_le/config-2.6.28 @@ -43,18 +43,11 @@ CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set # CONFIG_ATA_PIIX is not set CONFIG_ATA_SFF=y -# CONFIG_ATM is not set CONFIG_BASE_SMALL=0 # CONFIG_BCM47XX is not set CONFIG_BITREVERSE=y CONFIG_BRIDGE=m -# CONFIG_BT is not set CONFIG_CEVT_R4K=y -CONFIG_CIFS_DEBUG2=y -CONFIG_CIFS_EXPERIMENTAL=y -CONFIG_CIFS_STATS2=y -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_CIFS_XATTR=y CONFIG_CLASSIC_RCU=y CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2 init=/etc/preinit" # CONFIG_CPU_BIG_ENDIAN is not set @@ -87,12 +80,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_VR41XX is not set -CONFIG_CRYPTO_AEAD2=m -CONFIG_CRYPTO_ALGAPI2=m -CONFIG_CRYPTO_BLKCIPHER2=m -CONFIG_CRYPTO_HASH2=m -CONFIG_CRYPTO_MANAGER2=m -CONFIG_CRYPTO_RNG2=m CONFIG_CSRC_R4K=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set @@ -100,12 +87,8 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y CONFIG_EARLY_PRINTK=y CONFIG_ELF_CORE=y -# CONFIG_EXT3_FS_POSIX_ACL is not set -# CONFIG_EXT3_FS_SECURITY is not set -CONFIG_EXT3_FS_XATTR=y CONFIG_FIRMWARE_IN_KERNEL=y # CONFIG_FREEZER is not set -CONFIG_FS_MBCACHE=m CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_ACL=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -127,26 +110,7 @@ CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_IDE=y CONFIG_HAVE_OPROFILE=y CONFIG_HID=m -CONFIG_HID_A4TECH=m -CONFIG_HID_APPLE=m -CONFIG_HID_BELKIN=m -CONFIG_HID_BRIGHT=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m CONFIG_HID_COMPAT=y -CONFIG_HID_CYPRESS=m -CONFIG_HID_DELL=m -CONFIG_HID_EZKEY=m -CONFIG_HID_GYRATION=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_PANTHERLORD=m -CONFIG_HID_PETALYNX=m -# CONFIG_HID_PID is not set -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SUNPLUS=m CONFIG_HID_SUPPORT=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -161,19 +125,14 @@ CONFIG_HZ_250=y # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set # CONFIG_IDE is not set -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IEEE80211=m +CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_INITRAMFS_SOURCE="" CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_INPUT=m -# CONFIG_INPUT_EVDEV is not set -CONFIG_IPV6_MIP6=m -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IRQ_CPU=y # CONFIG_ISDN is not set -# CONFIG_JOLIET is not set CONFIG_KEXEC=y CONFIG_KMOD=y # CONFIG_LEDS_ALIX is not set @@ -183,8 +142,6 @@ CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_LEMOTE_FULONG is not set CONFIG_LLC=m -# CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_EMMA is not set @@ -196,7 +153,6 @@ CONFIG_LLC=m # CONFIG_MFD_TMIO is not set CONFIG_MII=m # CONFIG_MIKROTIK_RB532 is not set -# CONFIG_MINIX_FS is not set CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 @@ -210,7 +166,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MTD=y # CONFIG_MTD_ABSENT is not set CONFIG_MTD_ADM5120=y -# CONFIG_MTD_ALAUDA is not set CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_MTD_BLOCK2MTD is not set @@ -261,11 +216,7 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_SLRAM is not set CONFIG_MTD_TRXSPLIT=y # CONFIG_NATSEMI is not set -# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set -# CONFIG_NETFILTER_XT_TARGET_TARPIT is not set -# CONFIG_NET_PKTGEN is not set -CONFIG_NF_CT_ACCT=y -CONFIG_NF_DEFRAG_IPV4=m +# CONFIG_NF_DEFRAG_IPV4 is not set CONFIG_NO_HZ=y # CONFIG_NO_IOPORT is not set # CONFIG_NXP_STB220 is not set @@ -275,9 +226,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_8KB is not set -# CONFIG_PANTHERLORD_FF is not set # CONFIG_PARTITION_ADVANCED is not set -# CONFIG_PATA_PLATFORM is not set CONFIG_PATA_RB153_CF=m # CONFIG_PATA_SCH is not set CONFIG_PCI=y @@ -292,10 +241,10 @@ CONFIG_PCI_DOMAINS=y # CONFIG_PROBE_INITRD_HEADER is not set # CONFIG_PROM_EMU is not set # CONFIG_R6040 is not set -CONFIG_RFKILL_LEDS=y CONFIG_RTC_LIB=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +CONFIG_SCSI=m CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_AMBA_PL010=y @@ -324,12 +273,9 @@ CONFIG_SERIO_SERPORT=y # CONFIG_SIBYTE_SWARM is not set # CONFIG_SLAB is not set CONFIG_SLUB=y -CONFIG_SND_MIPS=y CONFIG_SOFT_WATCHDOG=m -CONFIG_SOUND_OSS_CORE=y CONFIG_SSB_POSSIBLE=y CONFIG_STP=m -# CONFIG_SUNRPC_REGISTER_V4 is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y @@ -339,14 +285,12 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y # CONFIG_TC35815 is not set -# CONFIG_THRUSTMASTER_FF is not set CONFIG_TICK_ONESHOT=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TRAD_SIGNALS=y CONFIG_USB=m CONFIG_USB_ADM5120_HCD=m CONFIG_USB_EHCI_HCD=m -# CONFIG_USB_NET_SMSC95XX is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD=m @@ -354,12 +298,8 @@ CONFIG_USB_SUPPORT=y # CONFIG_USB_UHCI_HCD is not set # CONFIG_VGASTATE is not set # CONFIG_VIA_RHINE is not set -CONFIG_VIDEO_MEDIA=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VLAN_8021Q=m CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_W1_SLAVE_BQ27000 is not set CONFIG_YAFFS_9BYTE_TAGS=y # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set CONFIG_YAFFS_AUTO_YAFFS2=y @@ -369,5 +309,4 @@ CONFIG_YAFFS_FS=y CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y CONFIG_YAFFS_YAFFS1=y CONFIG_YAFFS_YAFFS2=y -# CONFIG_ZEROPLUS_FF is not set CONFIG_ZONE_DMA_FLAG=0