From 37ad77f69239c4124b86b5e0807bf69eac548f98 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 26 May 2010 02:01:41 +0000 Subject: [PATCH] [x86] Reenable rtl8192su (Closes: #580740) The firmware previously embedded in rtl8192su has been removed upstream, so we have stopped patching it to use external firmware. Unfortunately I didn't remove the preceding patch that marked it broken. Add a reminder to remove this patch completely for the next upstream release/rc. svn path=/dists/trunk/linux-2.6/; revision=15769 --- debian/changelog | 8 ++++++++ debian/patches/series/1~experimental.2 | 1 + debian/patches/series/orig-0 | 1 + 3 files changed, 10 insertions(+) create mode 100644 debian/patches/series/1~experimental.2 diff --git a/debian/changelog b/debian/changelog index 9d97b6815..5083b8628 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +linux-2.6 (2.6.34-1~experimental.2) UNRELEASED; urgency=low + + [ Ben Hutchings ] + * [x86] Reenable rtl8192su, accidentally disabled in previous version + (Closes: #580740) + + -- Ben Hutchings Wed, 26 May 2010 02:55:03 +0100 + linux-2.6 (2.6.34-1~experimental.1) experimental; urgency=low * New upstream release: http://kernelnewbies.org/Linux_2_6_34 diff --git a/debian/patches/series/1~experimental.2 b/debian/patches/series/1~experimental.2 new file mode 100644 index 000000000..507b981e0 --- /dev/null +++ b/debian/patches/series/1~experimental.2 @@ -0,0 +1 @@ +- debian/dfsg/drivers-staging-rtl8192su-disable.patch diff --git a/debian/patches/series/orig-0 b/debian/patches/series/orig-0 index c63fad5ef..8be76db38 100644 --- a/debian/patches/series/orig-0 +++ b/debian/patches/series/orig-0 @@ -3,6 +3,7 @@ + debian/dfsg/drivers-infiniband-hw-ipath-iba7220-disable.patch + debian/dfsg/drivers-net-appletalk-cops.patch + debian/dfsg/drivers-staging-otus-disable.patch +# Next patch can be removed for next upstream release/rc + debian/dfsg/drivers-staging-rtl8192su-disable.patch + debian/dfsg/drivers-staging-wlags49_h2-disable.patch + debian/dfsg/drivers-staging-wlags49_h25-disable.patch