[kernel] r15496 - in dists/trunk/linux-2.6/debian: . patches/features/all

[Ben Hutchings]

Author: benh
Date: Wed Apr  7 03:08:14 2010
New Revision: 15496

Log:
[x86] Re-enable rt2860sta and rt2870sta drivers (Closes: #576723)

The firmware-loading patch needs to remove 'depends on BROKEN'.  I
forgot to include this when I updated it for 2.6.33 based on the patch
accepted upstream.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Apr  7 02:44:13 2010	(r15495)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Apr  7 03:08:14 2010	(r15496)
@@ -8,6 +8,8 @@
 
   [ Ben Hutchings ]
   * [x86] Enable ramzswap driver (Closes: #573912)
+  * [x86] Re-enable rt2860sta and rt2870sta drivers which were accidentally
+    disabled when moving to Linux 2.6.33 (Closes: #576723)
 
  -- Ian Campbell <ijc at hellion.org.uk>  Sat, 27 Mar 2010 08:09:28 +0000
 

Modified: dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch	Wed Apr  7 02:44:13 2010	(r15495)
+++ dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch	Wed Apr  7 03:08:14 2010	(r15496)
@@ -13,8 +13,11 @@
 
 --- a/drivers/staging/rt2860/Kconfig
 +++ b/drivers/staging/rt2860/Kconfig
-@@ -3,6 +3,8 @@ config RT2860
+@@ -1,9 +1,10 @@ config RT2860
+ config RT2860
+ 	tristate "Ralink 2860/3090 wireless support"
  	depends on PCI && X86 && WLAN
+-	depends on BROKEN
  	select WIRELESS_EXT
  	select WEXT_PRIV
 +	select CRC_CCITT
@@ -250,8 +253,11 @@
  	u16 ThisTbttNumToNextWakeUp;
 --- a/drivers/staging/rt2870/Kconfig
 +++ b/drivers/staging/rt2870/Kconfig
-@@ -3,5 +3,7 @@ config RT2870
+@@ -1,8 +1,9 @@ config RT2870
+ config RT2870
+ 	tristate "Ralink 2870/3070 wireless support"
  	depends on USB && X86 && WLAN
+-	depends on BROKEN
  	select WIRELESS_EXT
  	select WEXT_PRIV
 +	select CRC_CCITT