diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2007-05-01 22:32:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 17:59:06 -0700 |
| commit | bff832cda7bd1a861fd43813c3037119e50e7d93 (patch) | |
| tree | 84bcca75c98ecb8b1514c1aca47fcff1ebb4c312 /drivers/macintosh | |
| parent | b312b38c7411d4a2fff3fcdff13556b090f80f25 (diff) | |
| download | linux-bff832cda7bd1a861fd43813c3037119e50e7d93.tar.gz linux-bff832cda7bd1a861fd43813c3037119e50e7d93.tar.bz2 linux-bff832cda7bd1a861fd43813c3037119e50e7d93.zip | |
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 356c7216a179..dfdf11c1eec4 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); 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, void (*done)(struct adb_request *), return pmu_queue_request(req); } -static int +int pmu_queue_request(struct adb_request *req) { unsigned long flags; |