33 lines
1008 B
Diff
33 lines
1008 B
Diff
Subject: m68k: pmu_queue_request() declaration conflict
|
|
|
|
From: Finn Thain <fthain@telegraphics.com.au>
|
|
|
|
Fixes a "static qualifier follows non-static qualifier" error from gcc 4.
|
|
|
|
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
|
|
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
|
|
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
|
---
|
|
drivers/macintosh/via-pmu68k.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- linux-m68k-2.6.21.orig/drivers/macintosh/via-pmu68k.c
|
|
+++ linux-m68k-2.6.21/drivers/macintosh/via-pmu68k.c
|
|
@@ -111,7 +111,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);
|
|
@@ -475,7 +474,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;
|