From c9dc94dae38e024f00f565bce2a89ce5ea64fafc Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 7 Apr 2010 03:08:14 +0000 Subject: [PATCH] [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. svn path=/dists/trunk/linux-2.6/; revision=15496 --- debian/changelog | 2 ++ .../features/all/rt28x0sta-use-request_firmware.patch | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23db742cd..830baa82c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ linux-2.6 (2.6.33-1~experimental.5) UNRELEASED; urgency=low [ 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 Sat, 27 Mar 2010 08:09:28 +0000 diff --git a/debian/patches/features/all/rt28x0sta-use-request_firmware.patch b/debian/patches/features/all/rt28x0sta-use-request_firmware.patch index 6c7ef5c4e..f8220335c 100644 --- a/debian/patches/features/all/rt28x0sta-use-request_firmware.patch +++ b/debian/patches/features/all/rt28x0sta-use-request_firmware.patch @@ -13,8 +13,11 @@ Based on work by Darren Salt . --- 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 @@ Based on work by Darren Salt . 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