Skip to content

Commit

Permalink
m68k: pmu_queue_request() declaration conflict
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Finn Thain authored and Linus Torvalds committed May 5, 2007
1 parent b312b38 commit bff832c
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/macintosh/via-pmu68k.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit bff832c

Please sign in to comment.