[kernel] r13962 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Sat Jul 18 14:51:11 2009
New Revision: 13962

Log:
x86 renenable the current staging crap

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Jul 18 14:36:14 2009	(r13961)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Jul 18 14:51:11 2009	(r13962)
@@ -18,6 +18,7 @@
     SMARTJOYPLUS_FF.
   * Disable v4l1 ov511 and quickcam_messenger drivers.
   * [x86_64] Enable HW_RANDOM_VIA.
+  * [x86] Keep divers staging stuff enabled.
 
   [ Ben Hutchings ]
   * mga: remove unnecessary change from firmware-loading patch

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Jul 18 14:36:14 2009	(r13961)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Jul 18 14:51:11 2009	(r13962)
@@ -171,6 +171,194 @@
 CONFIG_XEN_NETDEV_FRONTEND=m
 
 ##
+## file: drivers/staging/Kconfig
+##
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+
+##
+## file: drivers/staging/agnx/Kconfig
+##
+# CONFIG_AGNX is not set
+
+##
+## file: drivers/staging/altpciechdma/Kconfig
+##
+# CONFIG_ALTERA_PCIE_CHDMA is not set
+
+##
+## file: drivers/staging/android/Kconfig
+##
+# CONFIG_ANDROID is not set
+# CONFIG_ANDROID_BINDER_IPC is not set
+# CONFIG_ANDROID_LOGGER is not set
+# CONFIG_ANDROID_RAM_CONSOLE is not set
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
+
+##
+## file: drivers/staging/asus_oled/Kconfig
+##
+# CONFIG_ASUS_OLED is not set
+
+##
+## file: drivers/staging/at76_usb/Kconfig
+##
+# CONFIG_USB_ATMEL is not set
+
+##
+## file: drivers/staging/b3dfg/Kconfig
+##
+# CONFIG_B3DFG is not set
+
+##
+## file: drivers/staging/comedi/Kconfig
+##
+# CONFIG_COMEDI is not set
+
+##
+## file: drivers/staging/dst/Kconfig
+##
+# CONFIG_DST is not set
+
+##
+## file: drivers/staging/echo/Kconfig
+##
+# CONFIG_ECHO is not set
+
+##
+## file: drivers/staging/epl/Kconfig
+##
+# CONFIG_EPL is not set
+
+##
+## file: drivers/staging/et131x/Kconfig
+##
+CONFIG_ET131X=m
+# CONFIG_ET131X_DEBUG is not set
+
+##
+## file: drivers/staging/frontier/Kconfig
+##
+# CONFIG_TRANZPORT is not set
+
+##
+## file: drivers/staging/go7007/Kconfig
+##
+# CONFIG_VIDEO_GO7007 is not set
+
+##
+## file: drivers/staging/heci/Kconfig
+##
+# CONFIG_HECI is not set
+
+##
+## file: drivers/staging/line6/Kconfig
+##
+# CONFIG_LINE6_USB is not set
+
+##
+## file: drivers/staging/me4000/Kconfig
+##
+# CONFIG_ME4000 is not set
+
+##
+## file: drivers/staging/meilhaus/Kconfig
+##
+# CONFIG_MEILHAUS is not set
+
+##
+## file: drivers/staging/mimio/Kconfig
+##
+# CONFIG_INPUT_MIMIO is not set
+
+##
+## file: drivers/staging/otus/Kconfig
+##
+# CONFIG_OTUS is not set
+
+##
+## file: drivers/staging/p9auth/Kconfig
+##
+# CONFIG_PLAN9AUTH is not set
+
+##
+## file: drivers/staging/panel/Kconfig
+##
+# CONFIG_PANEL is not set
+
+##
+## file: drivers/staging/phison/Kconfig
+##
+# CONFIG_IDE_PHISON is not set
+
+##
+## file: drivers/staging/poch/Kconfig
+##
+# CONFIG_POCH is not set
+
+##
+## file: drivers/staging/pohmelfs/Kconfig
+##
+CONFIG_POHMELFS=m
+# CONFIG_POHMELFS_DEBUG is not set
+CONFIG_POHMELFS_CRYPTO=y
+
+##
+## file: drivers/staging/rt2860/Kconfig
+##
+CONFIG_RT2860=m
+
+##
+## file: drivers/staging/rt2870/Kconfig
+##
+CONFIG_RT2870=m
+
+##
+## file: drivers/staging/rtl8187se/Kconfig
+##
+CONFIG_RTL8187SE=m
+
+##
+## file: drivers/staging/serqt_usb/Kconfig
+##
+# CONFIG_USB_SERIAL_QUATECH_ESU100 is not set
+
+##
+## file: drivers/staging/slicoss/Kconfig
+##
+# CONFIG_SLICOSS is not set
+
+##
+## file: drivers/staging/stlc45xx/Kconfig
+##
+# CONFIG_STLC45XX is not set
+
+##
+## file: drivers/staging/sxg/Kconfig
+##
+# CONFIG_SXG is not set
+
+##
+## file: drivers/staging/uc2322/Kconfig
+##
+# CONFIG_USB_SERIAL_ATEN2011 is not set
+
+##
+## file: drivers/staging/usbip/Kconfig
+##
+# CONFIG_USB_IP_COMMON is not set
+
+##
+## file: drivers/staging/winbond/Kconfig
+##
+# CONFIG_W35UND is not set
+
+##
+## file: drivers/staging/wlan-ng/Kconfig
+##
+CONFIG_PRISM2_USB=m
+
+##
 ## file: drivers/video/Kconfig
 ##
 CONFIG_XEN_FBDEV_FRONTEND=y