[kernel] r13953 - in dists/trunk/linux-2.6/debian: . config

[Bastian Blank]

Author: waldi
Date: Thu Jul 16 20:44:45 2009
New Revision: 13953

Log:
* debian/changelog: Update.
* debian/config/config: Disable STAGING.

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Jul 16 13:55:36 2009	(r13952)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jul 16 20:44:45 2009	(r13953)
@@ -29,6 +29,9 @@
   * [armel/orion5x, armel/kirkwood] Set GPIO_SYSFS=y since these
     platforms have been converted to GPIOLIB.
 
+  [ Bastian Blank ]
+  * Disable staging drivers by default.
+
  -- maximilian attems <maks at debian.org>  Thu, 18 Jun 2009 23:50:56 +0200
 
 linux-2.6 (2.6.30-1) unstable; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Thu Jul 16 13:55:36 2009	(r13952)
+++ dists/trunk/linux-2.6/debian/config/config	Thu Jul 16 20:44:45 2009	(r13953)
@@ -1971,192 +1971,10 @@
 ##
 ## file: drivers/staging/Kconfig
 ##
-CONFIG_STAGING=y
+# CONFIG_STAGING is not set
 # 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/uio/Kconfig
 ##
 CONFIG_UIO=m