summaryrefslogtreecommitdiff
path: root/debian/patches/debian/dfsg/files-1
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2011-11-14 15:49:29 +0000
committerBen Hutchings <benh@debian.org>2011-11-14 15:49:29 +0000
commitddbcf28662828b9e0c37101a1b893995dcc6caa0 (patch)
tree1394e30385e6aae386058476d9c7d099ee7767d8 /debian/patches/debian/dfsg/files-1
parentbe78e2ff73fceab46aebfe284e218f6c702d0807 (diff)
Update to 3.2-rc1
Drop a large number of patches that were merged upstream. Fix context in features/all/sound-pci-cs46xx-request_firmware.patch. Remove another firmware image sneaked into staging. svn path=/dists/trunk/linux-2.6/; revision=18288
Diffstat (limited to 'debian/patches/debian/dfsg/files-1')
-rw-r--r--debian/patches/debian/dfsg/files-12
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1
index 6578884f7..9dc41800c 100644
--- a/debian/patches/debian/dfsg/files-1
+++ b/debian/patches/debian/dfsg/files-1
@@ -18,6 +18,8 @@ rm drivers/staging/ft1000/ft1000-*/*.img
rm drivers/staging/keucr/init.h
+rm drivers/staging/rtl8192e/r8192E_hwimg.c
+
rm drivers/staging/wlags49_h2/ap_*.c
rm drivers/staging/wlags49_h2/sta_*.c