Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bff832cd authored by Finn Thain's avatar Finn Thain Committed by Linus Torvalds
Browse files

m68k: pmu_queue_request() declaration conflict 



Fixes a "static qualifier follows non-static qualifier" error from gcc 4.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b312b38c

drivers/macintosh/via-pmu68k.c

+1 −2
Original line number Diff line number Diff line
@@ -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;