From 61e1afd9447fd6601e1a06e655d089807f4e98db Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sun, 29 Aug 2010 12:57:22 +0000
Subject: [PATCH] * debian/changelog: Update. *
 debian/config/kernelarch-x86/config: Disable RT2860, RT2870, RT3090.

svn path=/dists/trunk/linux-2.6/; revision=16207
---
 debian/changelog                    |  4 ++++
 debian/config/kernelarch-x86/config | 15 ---------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7be9a12b5..3941194ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,10 @@ linux-2.6 (2.6.35-1~experimental.3) UNRELEASED; urgency=low
       necessary to install the kernel image package to use the dbg package
       since the dbg package already contains a complete image with symbols.
 
+  [ Bastian Blank ]
+  * Disable Ralink staging drivers, the in-tree ones reached "works-for-me"
+    status.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 18 Aug 2010 02:45:21 +0100
 
 linux-2.6 (2.6.35-1~experimental.2) experimental; urgency=low
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index a06f3187a..009fe14fb 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1100,21 +1100,6 @@ CONFIG_POHMELFS_CRYPTO=y
 CONFIG_RAMZSWAP=m
 CONFIG_RAMZSWAP_STATS=y
 
-##
-## file: drivers/staging/rt2860/Kconfig
-##
-CONFIG_RT2860=m
-
-##
-## file: drivers/staging/rt2870/Kconfig
-##
-CONFIG_RT2870=m
-
-##
-## file: drivers/staging/rt3090/Kconfig
-##
-CONFIG_RT3090=m
-
 ##
 ## file: drivers/staging/rtl8187se/Kconfig
 ##