[kernel] generic-2.6: resync 2.6.26 config

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / config-2.6.26

diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26
index 61809491b5ff47c570751149e0ef8aab2746395c..3cb0665c783f7600ed8cb68b63dfc7b1625d1ef2 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.26
+++ b/target/linux/generic-2.6/config-2.6.26
@@ -24,6 +24,7 @@ CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATARI_PARTITION is not set
 # CONFIG_ATA_GENERIC is not set
 # CONFIG_ATA_OVER_ETH is not set
+# CONFIG_ATA_SFF is not set
 # CONFIG_ATL1 is not set
 CONFIG_ATM=m
 CONFIG_ATMEL=m
@@ -154,6 +155,7 @@ CONFIG_BRIDGE_EBT_LIMIT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_MARK=m
 CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_NFLOG=m
 CONFIG_BRIDGE_EBT_PKTTYPE=m
 CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
@@ -564,6 +566,7 @@ CONFIG_IP6_NF_TARGET_ROUTE=m
 CONFIG_IPSEC_NAT_TRAVERSAL=y
 CONFIG_IPV6=m
 # CONFIG_IPV6_MIP6 is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 # CONFIG_IPV6_PRIVACY is not set
@@ -760,6 +763,7 @@ CONFIG_MISC_DEVICES=y
 CONFIG_MKISS=m
 # CONFIG_MMC is not set
 # CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_TEST is not set
 CONFIG_MMU=y
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -793,7 +797,7 @@ CONFIG_NET=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETDEBUG is not set
 CONFIG_NETDEVICES=y
-# CONFIG_NETDEVICES_MULTIQUEUE is not set
+CONFIG_NETDEVICES_MULTIQUEUE=y
 CONFIG_NETDEV_1000=y
 # CONFIG_NETDEV_10000 is not set
 CONFIG_NETFILTER=y
@@ -1166,7 +1170,8 @@ CONFIG_RAMFS=y
 # CONFIG_RELAY is not set
 # CONFIG_RESOURCES_64BIT is not set
 # CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL is not set
+CONFIG_RFKILL=m
+# CONFIG_RFKILL_INPUT is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_ROSE is not set
 CONFIG_RPCSEC_GSS_KRB5=m
@@ -1188,6 +1193,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
+# CONFIG_SATA_PMP is not set
 # CONFIG_SATA_PROMISE is not set
 # CONFIG_SATA_QSTOR is not set
 # CONFIG_SATA_SIL is not set
@@ -1484,6 +1490,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_WAVEFRONT is not set
 # CONFIG_SND_YMFPCI is not set
 # CONFIG_SNI_RM is not set
+# CONFIG_SOC_CAMERA is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
 CONFIG_SOUND=m
 # CONFIG_SOUND_PRIME is not set
@@ -1570,6 +1577,7 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USB is not set
+# CONFIG_USBPCWATCHDOG is not set
 # CONFIG_USB_ACECAD is not set
 CONFIG_USB_ACM=m
 # CONFIG_USB_ADUTUX is not set
@@ -1590,6 +1598,7 @@ CONFIG_USB_ATM=m
 # CONFIG_USB_BANDWIDTH is not set
 CONFIG_USB_BELKIN=y
 # CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_CATC=m
 # CONFIG_USB_CXACRU is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
@@ -1614,10 +1623,12 @@ CONFIG_USB_HID=m
 # CONFIG_USB_HIDDEV is not set
 CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
+CONFIG_USB_HSO=m
 # 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_ISP1760_HCD is not set
 CONFIG_USB_KAWETH=m
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_KBTAB is not set
@@ -1657,6 +1668,7 @@ CONFIG_USB_PEGASUS=m
 # CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m
 # CONFIG_USB_QUICKCAM_MESSENGER is not set
+# CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SE401 is not set
@@ -1702,6 +1714,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
 CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_OPTION=m
@@ -1710,6 +1723,7 @@ CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
@@ -1721,6 +1735,7 @@ CONFIG_USB_SPEEDTOUCH=m
 # CONFIG_USB_STKWEBCAM is not set
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_ALAUDA=y
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 CONFIG_USB_STORAGE_DATAFAB=y
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_DPCM=y
@@ -1740,9 +1755,11 @@ CONFIG_USB_SUPPORT=y
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_USBNET_MII=m
+# CONFIG_USB_VIDEO_CLASS is not set
 # CONFIG_USB_VICAM is not set
 # CONFIG_USB_W9968CF is not set
 # CONFIG_USB_WACOM is not set
+# CONFIG_USB_WDM is not set
 # CONFIG_USB_XPAD is not set
 # CONFIG_USB_XUSBATM is not set
 CONFIG_USB_YEALINK=m
@@ -1792,6 +1809,7 @@ CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_SAA711X is not set
 # CONFIG_VIDEO_SAA7127 is not set
 # CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_SAA717X is not set
 # CONFIG_VIDEO_SAA7185 is not set
 # CONFIG_VIDEO_SAA7191 is not set
 # CONFIG_VIDEO_STRADIS is not set
@@ -1852,6 +1870,7 @@ CONFIG_XFRM=y
 # CONFIG_XFRM_SUB_POLICY is not set
 CONFIG_XFRM_USER=m
 CONFIG_XFS_FS=m
+# CONFIG_XFS_DEBUG is not set
 # CONFIG_XFS_POSIX_ACL is not set
 # CONFIG_XFS_QUOTA is not set
 # CONFIG_XFS_RT is not set