summaryrefslogtreecommitdiff
path: root/debian/patches/debian/dfsg
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2009-11-04 02:02:19 +0000
committerBen Hutchings <benh@debian.org>2009-11-04 02:02:19 +0000
commit23229038effd56e64ef1d00372a9ac9868615cfe (patch)
treefa31fefa3e1000e5643a0e661e4f673329ce7ef8 /debian/patches/debian/dfsg
parent985b41bdad9206cd7cae14f646903a29e458b81e (diff)
downloaddebian-kernel-packaging-23229038effd56e64ef1d00372a9ac9868615cfe.tar.gz
Update to 2.6.32-rc6
Refresh firmware patches for Kconfig context changes. Remove bugfix patches merged upstream. svn path=/dists/trunk/linux-2.6/; revision=14541
Diffstat (limited to 'debian/patches/debian/dfsg')
-rw-r--r--debian/patches/debian/dfsg/drivers-staging-otus-disable.patch4
-rw-r--r--debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch6
-rw-r--r--debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch4
-rw-r--r--debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch2
-rw-r--r--debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch4
5 files changed, 7 insertions, 13 deletions
diff --git a/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch b/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch
index a4d805806..b7dc8b190 100644
--- a/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch
+++ b/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch
@@ -1,11 +1,9 @@
-diff --git a/drivers/staging/otus/Kconfig b/drivers/staging/otus/Kconfig
-index d549d08..fef9785 100644
--- a/drivers/staging/otus/Kconfig
+++ b/drivers/staging/otus/Kconfig
@@ -1,5 +1,6 @@
config OTUS
tristate "Atheros OTUS 802.11n USB wireless support"
+ depends on BROKEN
- depends on USB && WLAN_80211 && MAC80211
+ depends on USB && WLAN && MAC80211
default N
---help---
diff --git a/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
index e06d68f49..8885c480e 100644
--- a/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
+++ b/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
@@ -1,11 +1,9 @@
-diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig
-index 7f44e5e..9fb130d 100644
--- a/drivers/staging/rt2860/Kconfig
+++ b/drivers/staging/rt2860/Kconfig
@@ -1,5 +1,6 @@
config RT2860
tristate "Ralink 2860 wireless support"
+ depends on BROKEN
- depends on PCI && X86 && WLAN_80211
+ depends on PCI && X86 && WLAN
---help---
- This is an experimental driver for the Ralink 2860 wireless chip.
+ This is an experimental driver for the Ralink 2860 wireless chip.
diff --git a/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
index e5adc4605..6e9759d10 100644
--- a/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
+++ b/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
@@ -4,6 +4,6 @@
config RT2870
tristate "Ralink 2870/3070 wireless support"
+ depends on BROKEN
- depends on USB && X86 && WLAN_80211
+ depends on USB && X86 && WLAN
---help---
- This is an experimental driver for the Ralink xx70 wireless chips.
+ This is an experimental driver for the Ralink xx70 wireless chips.
diff --git a/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch
index b4d7ba1df..e4a4bc261 100644
--- a/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch
+++ b/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch
@@ -4,6 +4,6 @@
config RT3090
tristate "Ralink 3090 wireless support"
+ depends on BROKEN
- depends on PCI && X86 && WLAN_80211
+ depends on PCI && X86 && WLAN
---help---
This is an experimental driver for the Ralink 3090 wireless chip.
diff --git a/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
index 656c83ac9..beacebb8b 100644
--- a/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
+++ b/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
@@ -1,11 +1,9 @@
-diff --git a/drivers/staging/rtl8192su/Kconfig b/drivers/staging/rtl8192su/Kconfig
-index 770f412..3b6b088 100644
--- a/drivers/staging/rtl8192su/Kconfig
+++ b/drivers/staging/rtl8192su/Kconfig
@@ -1,5 +1,6 @@
config RTL8192SU
tristate "RealTek RTL8192SU Wireless LAN NIC driver"
+ depends on BROKEN
- depends on PCI
+ depends on PCI && WLAN
depends on WIRELESS_EXT
default N