diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2007-05-01 16:32:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 20:59:06 -0400 |
commit | bff832cda7bd1a861fd43813c3037119e50e7d93 (patch) | |
tree | 84bcca75c98ecb8b1514c1aca47fcff1ebb4c312 /drivers/macintosh | |
parent | b312b38c7411d4a2fff3fcdff13556b090f80f25 (diff) |
m68k: pmu_queue_request() declaration conflict
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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/via-pmu68k.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c index 356c7216a17..dfdf11c1eec 100644 --- a/drivers/macintosh/via-pmu68k.c +++ b/drivers/macintosh/via-pmu68k.c | |||
@@ -111,7 +111,6 @@ static int pmu_send_request(struct adb_request *req, int sync); | |||
111 | static int pmu_autopoll(int devs); | 111 | static int pmu_autopoll(int devs); |
112 | void pmu_poll(void); | 112 | void pmu_poll(void); |
113 | static int pmu_reset_bus(void); | 113 | static int pmu_reset_bus(void); |
114 | static int pmu_queue_request(struct adb_request *req); | ||
115 | 114 | ||
116 | static void pmu_start(void); | 115 | static void pmu_start(void); |
117 | static void send_byte(int x); | 116 | static void send_byte(int x); |
@@ -475,7 +474,7 @@ pmu_request(struct adb_request *req, void (*done)(struct adb_request *), | |||
475 | return pmu_queue_request(req); | 474 | return pmu_queue_request(req); |
476 | } | 475 | } |
477 | 476 | ||
478 | static int | 477 | int |
479 | pmu_queue_request(struct adb_request *req) | 478 | pmu_queue_request(struct adb_request *req) |
480 | { | 479 | { |
481 | unsigned long flags; | 480 | unsigned long flags; |