enable CONFIG_STAGING on 2.6.31

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17931 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 32 insertions, 1 deletions

diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index 81517153e..d3387973f 100644
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -17,8 +17,10 @@ CONFIG_AIO=y
 # CONFIG_AIRO is not set
 # CONFIG_AIRO_CS is not set
 # CONFIG_ALIM7101_WDT is not set
+# CONFIG_ALTERA_PCIE_CHDMA is not set
 # CONFIG_AMD8111_ETH is not set
 # CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ANDROID is not set
 CONFIG_ANON_INODES=y
 # CONFIG_APPLICOM is not set
 # CONFIG_AR8216_PHY is not set
@@ -69,6 +71,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARPD=y
 # CONFIG_ARTHUR is not set
 CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_ASUS_OLED is not set
 # CONFIG_AT24 is not set
 # CONFIG_AT76C50X_USB is not set
 # CONFIG_ATA is not set
@@ -115,6 +118,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_AX25 is not set
 # CONFIG_AX25_DAMA_SLAVE is not set
 # CONFIG_AX88796 is not set
+# CONFIG_B3DFG is not set
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_B44 is not set
@@ -312,6 +316,7 @@ CONFIG_CLS_U32_PERF=y
 CONFIG_CMDLINE=""
 # CONFIG_CNIC is not set
 # CONFIG_CODA_FS is not set
+# CONFIG_COMEDI is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -435,6 +440,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_DRAGONRISE_FF is not set
 # CONFIG_DRM is not set
 # CONFIG_DS1682 is not set
+# CONFIG_DST is not set
 # CONFIG_DTLK is not set
 # CONFIG_DUMMY is not set
 # CONFIG_DVB is not set
@@ -444,6 +450,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_E100 is not set
 # CONFIG_E1000 is not set
 # CONFIG_E1000E is not set
+# CONFIG_ECHO is not set
 # CONFIG_ECONET is not set
 # CONFIG_EEPRO100 is not set
 # CONFIG_EEPROM_93CX6 is not set
@@ -462,6 +469,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_EPIC100 is not set
 CONFIG_EPOLL=y
 # CONFIG_EQUALIZER is not set
+# CONFIG_ET131X is not set
 # CONFIG_ETHOC is not set
 CONFIG_EVENTFD=y
 # CONFIG_EVENT_TRACER is not set
@@ -542,6 +550,7 @@ CONFIG_HAMRADIO=y
 # CONFIG_HDLC_RAW is not set
 # CONFIG_HDLC_RAW_ETH is not set
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_HECI is not set
 # CONFIG_HERMES is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFS_FS is not set
@@ -661,6 +670,7 @@ CONFIG_HZ_100=y
 # CONFIG_IDEPCI_SHARE_IRQ is not set
 # CONFIG_IDE_GD is not set
 CONFIG_IDE_MAX_HWIFS=4
+# CONFIG_IDE_PHISON is not set
 CONFIG_IDE_PROC_FS=y
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set
@@ -735,6 +745,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_MIMIO is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_MOUSEDEV is not set
@@ -980,6 +991,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LIBFC is not set
 # CONFIG_LIBFCOE is not set
 # CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_LINE6_USB is not set
 CONFIG_LLC=y
 # CONFIG_LLC2 is not set
 CONFIG_LOCALVERSION=""
@@ -1003,12 +1015,14 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MD is not set
 # CONFIG_MDIO_BITBANG is not set
+# CONFIG_ME4000 is not set
 # CONFIG_MEDIA_ATTACH is not set
 # CONFIG_MEDIA_SUPPORT is not set
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_SAS is not set
+# CONFIG_MEILHAUS is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_MFD_CORE is not set
@@ -1489,10 +1503,12 @@ CONFIG_PCI_QUIRKS=y
 # CONFIG_PHYLIB is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PID_NS is not set
+# CONFIG_PLAN9AUTH is not set
 CONFIG_PLIST=y
 # CONFIG_PLX_HERMES is not set
 # CONFIG_PM is not set
 # CONFIG_PMIC_DA903X is not set
+# CONFIG_POHMELFS is not set
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_POWER_SUPPLY is not set
 CONFIG_PPC4xx_GPIO=y
@@ -1521,6 +1537,7 @@ CONFIG_PREEMPT_NONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRINTK=y
 # CONFIG_PRINTK_TIME is not set
+# CONFIG_PRISM2_USB is not set
 # CONFIG_PRISM54 is not set
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
@@ -1554,6 +1571,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_RAMFS=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_RDC_17F3101X is not set
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_GZIP is not set
 CONFIG_RD_LZMA=y
@@ -1576,7 +1594,10 @@ CONFIG_RD_LZMA=y
 # CONFIG_ROSE is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
 # CONFIG_RT2X00 is not set
+# CONFIG_RT3070 is not set
 # CONFIG_RTC_CLASS is not set
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_RTC_DRV_BQ4802 is not set
@@ -1622,6 +1643,8 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
+# CONFIG_RTL8187SE is not set
+# CONFIG_RTL8192SU is not set
 # CONFIG_RTL8306_PHY is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -1834,6 +1857,7 @@ CONFIG_SIGNALFD=y
 CONFIG_SLAB=y
 CONFIG_SLABINFO=y
 # CONFIG_SLHC is not set
+# CONFIG_SLICOSS is not set
 # CONFIG_SLIP is not set
 # CONFIG_SLOB is not set
 # CONFIG_SLUB is not set
@@ -2004,7 +2028,8 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKTRACE_SUPPORT=y
 # CONFIG_STACK_TRACER is not set
-# CONFIG_STAGING is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
 CONFIG_STANDALONE=y
 CONFIG_STDBINUTILS=y
 # CONFIG_STE10XP is not set
@@ -2071,6 +2096,7 @@ CONFIG_TMPFS=y
 # CONFIG_TR is not set
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_TRANZPORT is not set
 # CONFIG_TREE_RCU is not set
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_TUN is not set
@@ -2107,12 +2133,14 @@ CONFIG_USB_ARMLINUX=y
 # CONFIG_USB_ATI_REMOTE is not set
 # CONFIG_USB_ATI_REMOTE2 is not set
 # CONFIG_USB_ATM is not set
+# CONFIG_USB_ATMEL is not set
 # CONFIG_USB_AUERSWALD is not set
 # 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 is not set
+# CONFIG_USB_CPC is not set
 # CONFIG_USB_CXACRU is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -2170,6 +2198,7 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_IBMCAM is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IP_COMMON is not set
 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
@@ -2274,6 +2303,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 # CONFIG_USB_SERIAL_OTI6858 is not set
 # CONFIG_USB_SERIAL_PL2303 is not set
 # CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
 # CONFIG_USB_SERIAL_SAFE is not set
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 # CONFIG_USB_SERIAL_SIEMENS_MPI is not set
@@ -2424,6 +2454,7 @@ CONFIG_VLAN_8021Q=y
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_VT is not set
+# CONFIG_VT6655 is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_W1 is not set
 # CONFIG_W1_MASTER_DS1WM is not set