From 9cc7ec00093197e194cc24970546f6aeb0632b85 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Wed, 1 Apr 2009 19:09:04 +0000 Subject: [PATCH] nuke patch that landed anyway in 2.6.29.1 svn path=/dists/sid/linux-2.6/; revision=13313 --- debian/changelog | 2 +- .../drivers-net-dnet.c-needs-linux-io.h.patch | 35 ------------------- debian/patches/series/2 | 1 - 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 debian/patches/bugfix/all/drivers-net-dnet.c-needs-linux-io.h.patch diff --git a/debian/changelog b/debian/changelog index 10457ebd9..35c0a4361 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ linux-2.6 (2.6.29-2) UNRELEASED; urgency=low [ maximilian attems ] * linux-libc-dev: Bump versioned replaces libdrm-dev. - * Add drivers-net-dnet.c-needs-linux-io.h.patch. + * parisc: hardcode gcc-4.3 usage. [ Bastian Blank ] * Install all needed Makefiles into common headers package. diff --git a/debian/patches/bugfix/all/drivers-net-dnet.c-needs-linux-io.h.patch b/debian/patches/bugfix/all/drivers-net-dnet.c-needs-linux-io.h.patch deleted file mode 100644 index 0e077d71e..000000000 --- a/debian/patches/bugfix/all/drivers-net-dnet.c-needs-linux-io.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 142071b83426674ef2dab98cf2a6627328d0988e Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven -Date: Tue, 24 Mar 2009 13:19:50 -0700 -Subject: [PATCH] dnet: drivers/net/dnet.c needs - -On m68k: -| drivers/net/dnet.c: In function 'dnet_readw_mac': -| drivers/net/dnet.c:36: error: implicit declaration of function 'writel' -| drivers/net/dnet.c:43: error: implicit declaration of function 'readl' -| drivers/net/dnet.c: In function 'dnet_probe': -| drivers/net/dnet.c:873: error: implicit declaration of function 'ioremap' -| drivers/net/dnet.c:873: warning: assignment makes pointer from integer without a cast -| drivers/net/dnet.c:939: error: implicit declaration of function 'iounmap' - -Signed-off-by: Geert Uytterhoeven -Signed-off-by: David S. Miller ---- - drivers/net/dnet.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c -index 1b40632..edf23c9 100644 ---- a/drivers/net/dnet.c -+++ b/drivers/net/dnet.c -@@ -9,6 +9,7 @@ - * published by the Free Software Foundation. - */ - #include -+#include - #include - #include - #include --- -1.6.2.1 - diff --git a/debian/patches/series/2 b/debian/patches/series/2 index b30902414..5e0364ff8 100644 --- a/debian/patches/series/2 +++ b/debian/patches/series/2 @@ -1,2 +1 @@ + debian/dfsg/drivers-net-bnx2-fw-verfix.patch -+ bugfix/all/drivers-net-dnet.c-needs-linux-io.h.patch