From deefcf68cd9db38ad3dcf1072c962fa67466ef64 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Fri, 8 Jan 2010 10:49:28 +0000 Subject: [PATCH] topconfig disable some staging stuff could be enabled on request for x86. svn path=/dists/trunk/linux-2.6/; revision=14905 --- debian/changelog | 1 + debian/config/config | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/debian/changelog b/debian/changelog index b065baf26..110f11ac4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ linux-2.6 (2.6.32-5) UNRELEASED; urgency=low (closes: #564156) * topconfig set PATA_ATP867X, PATA_RDC, SND_CS5535AUDIO. * [x86] set RTL8192E. + * Explicitly disable diverse staging drivers. -- Ben Hutchings Thu, 07 Jan 2010 19:19:32 +0000 diff --git a/debian/config/config b/debian/config/config index f0a0dada4..181c6886f 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2128,6 +2128,16 @@ CONFIG_STAGING=y ## # CONFIG_COMEDI is not set +## +## file: drivers/staging/cx25821/Kconfig +## +# CONFIG_VIDEO_CX25821 is not set + +## +## file: drivers/staging/dream/Kconfig +## +# CONFIG_INPUT_GPIO is not set + ## ## file: drivers/staging/dst/Kconfig ## @@ -2153,6 +2163,16 @@ CONFIG_STAGING=y ## # CONFIG_VIDEO_GO7007 is not set +## +## file: drivers/staging/hv/Kconfig +## +# CONFIG_HYPERV is not set + +## +## file: drivers/staging/iio/Kconfig +## +# CONFIG_VIDEO_IIO is not set + ## ## file: drivers/staging/line6/Kconfig ## @@ -2193,6 +2213,11 @@ CONFIG_STAGING=y ## # CONFIG_POHMELFS is not set +## +## file: drivers/staging/rar/Kconfig +## +# CONFIG_RAR_REGISTER is not set + ## ## file: drivers/staging/rt2860/Kconfig ## @@ -2252,11 +2277,21 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m ## # CONFIG_USB_IP_COMMON is not set +## +## file: drivers/staging/vme/Kconfig +## +# CONFIG_VME_BUS is not set + ## ## file: drivers/staging/vt6655/Kconfig ## # CONFIG_VT6655 is not set +## +## file: drivers/staging/vt6656/Kconfig +## +# CONFIG_VT6656 is not set + ## ## file: drivers/staging/winbond/Kconfig ##