[adm5120] fix ethernet vlan matrix of the NP28G board (closes: #2387)

[openwrt.git] / target / linux / generic-2.6 / config-2.6.22

diff --git a/target/linux/generic-2.6/config-2.6.22 b/target/linux/generic-2.6/config-2.6.22
index 1eaf9d7..ab286f0 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.22
+++ b/target/linux/generic-2.6/config-2.6.22
@@ -19,6 +19,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARPD=y
 CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA is not set
 CONFIG_ARPD=y
 CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA is not set

+# CONFIG_ATA_GENERIC is not set

 # CONFIG_ATALK is not set
 # CONFIG_ATARI_PARTITION is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_ATALK is not set
 # CONFIG_ATARI_PARTITION is not set
 # CONFIG_ATA_OVER_ETH is not set


@@ -30,6 +31,7 @@ CONFIG_ATM_BR2684=m
 CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_CLIP_NO_ICMP=y
 CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_CLIP_NO_ICMP=y

+# CONFIG_ATM_DRIVERS is not set

 CONFIG_ATM_DUMMY=m
 # CONFIG_ATM_ENI is not set
 # CONFIG_ATM_FIRESTREAM is not set
 CONFIG_ATM_DUMMY=m
 # CONFIG_ATM_ENI is not set
 # CONFIG_ATM_FIRESTREAM is not set


@@ -87,7 +89,10 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_DELKIN is not set
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_DELKIN is not set
 # CONFIG_BLK_DEV_FD is not set

+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set

 # CONFIG_BLK_DEV_IDECS is not set
 # CONFIG_BLK_DEV_IDECS is not set

+# CONFIG_BLK_DEV_IDEPCI is not set

 # CONFIG_BLK_DEV_IDEPNP is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEPNP is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_BLK_DEV_IDETAPE is not set


@@ -208,7 +213,7 @@ CONFIG_CONFIGFS_FS=y
 CONFIG_CRC16=m
 CONFIG_CRC32=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC32=y
 CONFIG_CRC_CCITT=m

-# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC_ITU_T=m

 CONFIG_CROSSCOMPILE=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AES=m
 CONFIG_CROSSCOMPILE=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AES=m


@@ -286,6 +291,7 @@ CONFIG_E100=m
 # CONFIG_E1000 is not set
 # CONFIG_ECONET is not set
 # CONFIG_EEPRO100 is not set
 # CONFIG_E1000 is not set
 # CONFIG_ECONET is not set
 # CONFIG_EEPRO100 is not set

+CONFIG_EEPROM_93CX6=m

 # CONFIG_EFI_PARTITION is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_ELF_CORE is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_ELF_CORE is not set


@@ -340,6 +346,7 @@ CONFIG_HAMRADIO=y
 CONFIG_HERMES=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_HFS_FS=m
 CONFIG_HERMES=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_HFS_FS=m

+# CONFIG_HID is not set

 # CONFIG_HID_DEBUG is not set
 # CONFIG_HID_FF is not set
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HID_DEBUG is not set
 # CONFIG_HID_FF is not set
 CONFIG_HIGH_RES_TIMERS=y


@@ -373,11 +380,13 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_ALI15X3 is not set
 # CONFIG_I2C_AMD756 is not set
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_ALI15X3 is not set
 # CONFIG_I2C_AMD756 is not set
 # CONFIG_I2C_AMD8111 is not set

+# CONFIG_I2C_CHARDEV is not set

 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_ELEKTOR is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_ELEKTOR is not set

+# CONFIG_I2C_GPIO is not set

 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_NFORCE2 is not set


@@ -398,6 +407,11 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_VOODOO3 is not set
 # CONFIG_I2O is not set
 # CONFIG_I82092 is not set
 # CONFIG_I2C_VOODOO3 is not set
 # CONFIG_I2O is not set
 # CONFIG_I82092 is not set

+# CONFIG_ICPLUS_PHY is not set
+CONFIG_IDE_MAX_HWIFS=4
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y

 # CONFIG_IEEE1394 is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 # CONFIG_IEEE1394 is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_CCMP=m


@@ -426,15 +440,14 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
 CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET_AH=m
 CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET_AH=m

-# CONFIG_INET_DCCP_DIAG is not et

 CONFIG_INET_DIAG=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_TUNNEL=m

-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m

 CONFIG_INET_XFRM_TUNNEL=m
 # CONFIG_INFINIBAND is not set
 # CONFIG_INFTL is not set
 CONFIG_INET_XFRM_TUNNEL=m
 # CONFIG_INFINIBAND is not set
 # CONFIG_INFTL is not set


@@ -442,19 +455,26 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_INOTIFY is not set
 # CONFIG_INOTIFY_USER is not set
 # CONFIG_INPUT is not set
 # CONFIG_INOTIFY is not set
 # CONFIG_INOTIFY_USER is not set
 # CONFIG_INPUT is not set

+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set

 # CONFIG_INPUT_EVBUG is not set
 CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_EVBUG is not set
 CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_KEYBOARD is not set

+# CONFIG_INPUT_KEYSPAN_REMOTE is not set

 # CONFIG_INPUT_MISC is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_MISC is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_MOUSEDEV is not set

+# CONFIG_INPUT_PCSPKR is not set

 # CONFIG_INPUT_POLLDEV is not set
 # CONFIG_INPUT_POLLDEV is not set

+# CONFIG_INPUT_POWERMATE is not set

 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_TSDEV is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_TSDEV is not set

+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set

 # CONFIG_IOSCHED_AS is not set
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_IOSCHED_DEADLINE=y
 # CONFIG_IOSCHED_AS is not set
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_IOSCHED_DEADLINE=y


@@ -515,7 +535,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_CONNTRACK=y
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
 CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_CONNTRACK=y
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
 CONFIG_IP_NF_CONNTRACK_MARK=y

-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set

 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m
 CONFIG_IP_NF_FILTER=y


@@ -569,12 +588,11 @@ CONFIG_IP_NF_TARGET_IMQ=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=m

-CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_TARGET_REDIRECT=m

 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_ROUTE=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_SET=m
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_ROUTE=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_SET=m

-CONFIG_IP_NF_TARGET_TCPMSS=y

 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_TARGET_ULOG=m


@@ -614,7 +632,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y
 # CONFIG_JFFS2_FS_XATTR is not set
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 # CONFIG_JFFS2_FS_XATTR is not set
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set

-# CONFIG_JFFS2_SUMMARY is not set
+CONFIG_JFFS2_SUMMARY=y

 CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFFS_FS is not set
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFFS_FS is not set
 # CONFIG_JFS_DEBUG is not set


@@ -636,6 +654,7 @@ CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_TIMER=y

+# CONFIG_LEDS_TRIGGER_IDE_DISK is not set

 # CONFIG_LEGACY_PTYS is not set
 CONFIG_LIBCRC32C=m
 # CONFIG_LIBERTAS is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_LIBCRC32C=m
 # CONFIG_LIBERTAS is not set


@@ -650,9 +669,9 @@ CONFIG_LOCKD_V4=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSF is not set
 # CONFIG_LXT_PHY is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSF is not set
 # CONFIG_LXT_PHY is not set

+CONFIG_MAC80211=m

 # CONFIG_MAC80211_DEBUG is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUG is not set
 CONFIG_MAC80211_LEDS=y

-CONFIG_MAC80211=m

 # CONFIG_MAC_EMUMOUSEBTN is not set
 CONFIG_MAC_PARTITION=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set
 CONFIG_MAC_PARTITION=y
 # CONFIG_MAGIC_SYSRQ is not set


@@ -695,7 +714,7 @@ CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m

-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m

 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m


@@ -716,7 +735,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 CONFIG_NETFILTER_XT_MATCH_STRING=m

-CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m

 CONFIG_NETFILTER_XT_TARGET_CHAOS=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CHAOS=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m


@@ -806,7 +825,7 @@ CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set
 CONFIG_NF_CONNTRACK=y
 CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set
 CONFIG_NF_CONNTRACK=y

-# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_AMANDA=m

 CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 CONFIG_NF_CONNTRACK_FTP=m


@@ -816,24 +835,25 @@ CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_MARK=y
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_MARK=y
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set

-# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PPTP=m

 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y

+CONFIG_NF_CONNTRACK_RTSP=m

 # CONFIG_NF_CONNTRACK_SANE is not set
 CONFIG_NF_CONNTRACK_SIP=m
 # CONFIG_NF_CONNTRACK_SANE is not set
 CONFIG_NF_CONNTRACK_SIP=m

-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
+CONFIG_NF_CONNTRACK_TFTP=m

 CONFIG_NF_CT_ACCT=y
 # CONFIG_NF_CT_PROTO_SCTP is not set
 CONFIG_NF_NAT=y
 CONFIG_NF_CT_ACCT=y
 # CONFIG_NF_CT_PROTO_SCTP is not set
 CONFIG_NF_NAT=y

-# CONFIG_NF_NAT_AMANDA is not set
+CONFIG_NF_NAT_AMANDA=m

 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_NEEDED=y

-# CONFIG_NF_NAT_PPTP is not set
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_RTSP=m

 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_SIP=m

-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_TFTP=m

 CONFIG_NLS=m
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS=m
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_CODEPAGE_1250=m


@@ -874,8 +894,8 @@ CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=m
 CONFIG_NLS_KOI8_R=m
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=m

-CONFIG_NO_HZ=y

 CONFIG_NORTEL_HERMES=m
 CONFIG_NORTEL_HERMES=m

+CONFIG_NO_HZ=y

 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set


@@ -935,8 +955,8 @@ CONFIG_PCI=y
 # CONFIG_PCI_ATMEL is not set
 CONFIG_PCI_HERMES=m
 # CONFIG_PCMCIA is not set
 # CONFIG_PCI_ATMEL is not set
 CONFIG_PCI_HERMES=m
 # CONFIG_PCMCIA is not set

-# CONFIG_PCMCIA_ATMEL is not set

 # CONFIG_PCMCIA_AHA152X is not set
 # CONFIG_PCMCIA_AHA152X is not set

+# CONFIG_PCMCIA_ATMEL is not set

 # CONFIG_PCMCIA_DEBUG is not set
 # CONFIG_PCMCIA_FDOMAIN is not set
 # CONFIG_PCMCIA_HERMES is not set
 # CONFIG_PCMCIA_DEBUG is not set
 # CONFIG_PCMCIA_FDOMAIN is not set
 # CONFIG_PCMCIA_HERMES is not set


@@ -1012,7 +1032,7 @@ CONFIG_RAMFS=y
 # CONFIG_RESOURCES_64BIT is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_RFKILL is not set
 # CONFIG_RESOURCES_64BIT is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_RFKILL is not set

-CONFIG_ROMFS_FS=m
+# CONFIG_ROMFS_FS is not set

 # CONFIG_ROSE is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_ROSE is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set


@@ -1021,6 +1041,8 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_MAX6900 is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set

+# CONFIG_SATA_AHCI is not set
+# CONFIG_PDC_ADMA is not set

 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set


@@ -1174,10 +1196,10 @@ CONFIG_SIGNALFD=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 CONFIG_SLAB=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 CONFIG_SLAB=y

-# CONFIG_SLUB is not set

 CONFIG_SLHC=m
 # CONFIG_SLIP is not set
 # CONFIG_SLOB is not set
 CONFIG_SLHC=m
 # CONFIG_SLIP is not set
 # CONFIG_SLOB is not set

+# CONFIG_SLUB is not set

 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_SND=m
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_SND=m


@@ -1336,10 +1358,10 @@ CONFIG_TCP_CONG_HYBLA=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_SCALABLE=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_SCALABLE=m

-CONFIG_TCP_CONG_YEAH=m

 CONFIG_TCP_CONG_VEGAS=y
 CONFIG_TCP_CONG_VENO=m
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_VEGAS=y
 CONFIG_TCP_CONG_VENO=m
 CONFIG_TCP_CONG_WESTWOOD=m

+CONFIG_TCP_CONG_YEAH=m

 # CONFIG_TCP_MD5SIG is not set
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_BM=m
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_BM=m


@@ -1357,6 +1379,7 @@ CONFIG_TMPFS=y
 # CONFIG_TR is not set
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_TUN=m
 # CONFIG_TR is not set
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_TUN=m

+# CONFIG_TUNER_3036 is not set

 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
 # CONFIG_UFS_FS is not set
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
 # CONFIG_UFS_FS is not set


@@ -1390,21 +1413,25 @@ CONFIG_USB_CATC=m
 # CONFIG_USB_CYTHERM is not set
 # CONFIG_USB_DABUSB is not set
 # CONFIG_USB_DEBUG is not set
 # CONFIG_USB_CYTHERM is not set
 # CONFIG_USB_DABUSB is not set
 # CONFIG_USB_DEBUG is not set

-# CONFIG_USB_DEVICE_CLASS is not set

 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DEVICEFS=y

+# CONFIG_USB_DEVICE_CLASS is not set

 # CONFIG_USB_DSBR is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_DSBR is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set

+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set

 # CONFIG_USB_EMI26 is not set
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EPSON2888 is not set
 # CONFIG_USB_EMI26 is not set
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EPSON2888 is not set

+# CONFIG_USB_ET61X251 is not set

 CONFIG_USB_EZUSB=y
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_GADGET is not set
 CONFIG_USB_HID=m
 CONFIG_USB_EZUSB=y
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_GADGET is not set
 CONFIG_USB_HID=m

-# CONFIG_HID_FF is not set

 # CONFIG_USB_HIDDEV is not set
 CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_USB_HIDDEV is not set
 CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set

+# CONFIG_USB_IBMCAM is not set

 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_ISP116X_HCD is not set


@@ -1413,6 +1440,7 @@ CONFIG_USB_KAWETH=m
 # CONFIG_USB_KBTAB is not set
 # CONFIG_USB_KC2190 is not set
 # CONFIG_USB_KEYSPAN_REMOTE is not set
 # CONFIG_USB_KBTAB is not set
 # CONFIG_USB_KC2190 is not set
 # CONFIG_USB_KEYSPAN_REMOTE is not set

+# CONFIG_USB_KONICAWC is not set

 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_LED is not set


@@ -1436,12 +1464,15 @@ CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_OHCI_HCD is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_OHCI_HCD is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OTG is not set

+# CONFIG_USB_OV511 is not set

 CONFIG_USB_PEGASUS=m
 # CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m
 CONFIG_USB_PEGASUS=m
 # CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m

+# CONFIG_USB_QUICKCAM_MESSENGER is not set

 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set

+# CONFIG_USB_SE401 is not set

 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_AIRPRIME=m
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_AIRPRIME=m


@@ -1495,6 +1526,7 @@ CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_SL811_HCD is not set
 CONFIG_USB_SERIAL_XIRCOM=m
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_SL811_HCD is not set

+# CONFIG_USB_SN9C102 is not set

 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_ALAUDA=y
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_ALAUDA=y


@@ -1502,49 +1534,78 @@ CONFIG_USB_STORAGE_DATAFAB=y
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_DPCM=y
 CONFIG_USB_STORAGE_FREECOM=y
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_DPCM=y
 CONFIG_USB_STORAGE_FREECOM=y

+# CONFIG_USB_STORAGE_ISD200 is not set

 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_KARMA=y
 # CONFIG_USB_STORAGE_ONETOUCH is not set
 CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_USBAT=y
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_KARMA=y
 # CONFIG_USB_STORAGE_ONETOUCH is not set
 CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_USBAT=y

+# CONFIG_USB_STV680 is not set

 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TOUCHSCREEN is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_USBNET_MII=m
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TOUCHSCREEN is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_USBNET_MII=m

+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_W9968CF is not set

 # CONFIG_USB_WACOM is not set
 # CONFIG_USB_XPAD is not set
 # CONFIG_USB_XUSBATM is not set
 CONFIG_USB_YEALINK=m
 # CONFIG_USB_WACOM is not set
 # CONFIG_USB_XPAD is not set
 # CONFIG_USB_XUSBATM is not set
 CONFIG_USB_YEALINK=m

+# CONFIG_USB_ZC0301 is not set

 # CONFIG_USB_ZD1201 is not set
 # CONFIG_USB_ZD1201 is not set

+# CONFIG_USB_ZR364XX is not set

 # CONFIG_UTS_NS is not set
 CONFIG_VFAT_FS=m
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_UTS_NS is not set
 CONFIG_VFAT_FS=m
 # CONFIG_VIA_VELOCITY is not set

+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set

 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_ADV_DEBUG is not set

+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT848 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set

 # CONFIG_VIDEO_CAFE_CCIC is not set
 # CONFIG_VIDEO_CAPTURE_DRIVERS is not set
 # CONFIG_VIDEO_CAFE_CCIC is not set
 # CONFIG_VIDEO_CAPTURE_DRIVERS is not set

+# CONFIG_VIDEO_CPIA is not set

 # CONFIG_VIDEO_CS53L32A is not set
 # CONFIG_VIDEO_CX2341X is not set
 # CONFIG_VIDEO_CX25840 is not set
 # CONFIG_VIDEO_CX88 is not set
 CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_CS53L32A is not set
 # CONFIG_VIDEO_CX2341X is not set
 # CONFIG_VIDEO_CX25840 is not set
 # CONFIG_VIDEO_CX88 is not set
 CONFIG_VIDEO_DEV=m

+# CONFIG_VIDEO_DPC is not set
+# CONFIG_VIDEO_EM28XX is not set

 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
 # CONFIG_VIDEO_HEXIUM_GEMINI is not set
 # CONFIG_VIDEO_HEXIUM_ORION is not set
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
 # CONFIG_VIDEO_HEXIUM_GEMINI is not set
 # CONFIG_VIDEO_HEXIUM_ORION is not set

+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_KS0127 is not set

 # CONFIG_VIDEO_MSP3400 is not set
 # CONFIG_VIDEO_MSP3400 is not set

+# CONFIG_VIDEO_MXB is not set

 # CONFIG_VIDEO_OV7670 is not set
 # CONFIG_VIDEO_OV7670 is not set

+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_VIDEO_PMS is not set

 # CONFIG_VIDEO_PVRUSB2 is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_VIDEO_PVRUSB2 is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set

+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA7111 is not set
+# CONFIG_VIDEO_SAA7114 is not set

 # CONFIG_VIDEO_SAA711X is not set
 # CONFIG_VIDEO_SAA7127 is not set
 # CONFIG_VIDEO_SAA7134 is not set
 # CONFIG_VIDEO_SAA711X is not set
 # CONFIG_VIDEO_SAA7127 is not set
 # CONFIG_VIDEO_SAA7134 is not set

+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_STRADIS is not set
+# CONFIG_VIDEO_TDA7432 is not set

 # CONFIG_VIDEO_TDA9840 is not set
 # CONFIG_VIDEO_TDA9840 is not set

+# CONFIG_VIDEO_TDA9875 is not set

 # CONFIG_VIDEO_TEA6415C is not set
 # CONFIG_VIDEO_TEA6420 is not set
 # CONFIG_VIDEO_TLV320AIC23B is not set
 # CONFIG_VIDEO_TEA6415C is not set
 # CONFIG_VIDEO_TEA6420 is not set
 # CONFIG_VIDEO_TLV320AIC23B is not set

+# CONFIG_VIDEO_TVAUDIO is not set

 # CONFIG_VIDEO_TVP5150 is not set
 # CONFIG_VIDEO_UPD64031A is not set
 # CONFIG_VIDEO_UPD64083 is not set
 # CONFIG_VIDEO_TVP5150 is not set
 # CONFIG_VIDEO_UPD64031A is not set
 # CONFIG_VIDEO_UPD64083 is not set


@@ -1553,8 +1614,10 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_VIVI is not set
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_VIVI is not set

+# CONFIG_VIDEO_VPX3220 is not set

 # CONFIG_VIDEO_WM8739 is not set
 # CONFIG_VIDEO_WM8775 is not set
 # CONFIG_VIDEO_WM8739 is not set
 # CONFIG_VIDEO_WM8775 is not set

+# CONFIG_VIDEO_ZORAN is not set

 # CONFIG_VITESSE_PHY is not set
 CONFIG_VLAN_8021Q=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_VITESSE_PHY is not set
 CONFIG_VLAN_8021Q=y
 # CONFIG_VM_EVENT_COUNTERS is not set