[kernel] r6918 - dists/trunk/linux-2.6/debian/patches

[Christian T. Steigies]

Author: cts
Date: Wed Jun 28 22:34:29 2006
New Revision: 6918

Added:
   dists/trunk/linux-2.6/debian/patches/m68k-gcc-4-fix.patch

Log:
add one patch needed for m68k to build with gcc-4.1, we still need more, so don't activate this yet


Added: dists/trunk/linux-2.6/debian/patches/m68k-gcc-4-fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/m68k-gcc-4-fix.patch	Wed Jun 28 22:34:29 2006
@@ -0,0 +1,33 @@
+Fixes a "static qualifier follows non-static qualifier" error from gcc 4.
+
+Signed-off-by: Finn Thain <fthain at telegraphics.com.au>
+Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
+
+---
+
+ drivers/macintosh/via-pmu68k.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+35dfd8f879480cc93798d97ffcbff7eadf9e5f2e
+diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
+index 35b7032..50726d9 100644
+--- a/drivers/macintosh/via-pmu68k.c
++++ b/drivers/macintosh/via-pmu68k.c
+@@ -112,7 +112,6 @@ static int pmu_send_request(struct adb_r
+ static int pmu_autopoll(int devs);
+ void pmu_poll(void);
+ static int pmu_reset_bus(void);
+-static int pmu_queue_request(struct adb_request *req);
+ 
+ static void pmu_start(void);
+ static void send_byte(int x);
+@@ -477,7 +476,7 @@ pmu_request(struct adb_request *req, voi
+ 	return pmu_queue_request(req);
+ }
+ 
+-static int 
++int
+ pmu_queue_request(struct adb_request *req)
+ {
+ 	unsigned long flags;
+