summaryrefslogtreecommitdiff
path: root/debian/patches/debian/dfsg/files-1
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2011-02-16 13:38:58 +0000
committerBen Hutchings <benh@debian.org>2011-02-16 13:38:58 +0000
commit3f3fa452a51aa5699c409fce36103df493ad8754 (patch)
treed3add71799ab7fc9df7a59dc720d848366a674d9 /debian/patches/debian/dfsg/files-1
parent495b6924868591087411c31e267ffc35a35649a5 (diff)
Update to 2.6.38-rc5
Adjust/remove patches as appropriate. svn path=/dists/trunk/linux-2.6/; revision=16898
Diffstat (limited to 'debian/patches/debian/dfsg/files-1')
-rw-r--r--debian/patches/debian/dfsg/files-15
1 files changed, 1 insertions, 4 deletions
diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1
index f5791f402..bb2e4d208 100644
--- a/debian/patches/debian/dfsg/files-1
+++ b/debian/patches/debian/dfsg/files-1
@@ -43,10 +43,7 @@ rm drivers/net/appletalk/cops.h
rm drivers/net/appletalk/cops_ffdrv.h
rm drivers/net/appletalk/cops_ltdrv.h
-unifdef drivers/net/r8169.c -UREMOVE_DFSG
-
-# For next version
-#rm drivers/staging/ft1000/ft1000-pcmcia/boot.h
+rm drivers/staging/ft1000/ft1000-pcmcia/boot.h
rm drivers/staging/keucr/init.h