Commit:     bff832cda7bd1a861fd43813c3037119e50e7d93
Parent:     b312b38c7411d4a2fff3fcdff13556b090f80f25
Author:     Finn Thain <[EMAIL PROTECTED]>
AuthorDate: Tue May 1 22:32:49 2007 +0200
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri May 4 17:59:06 2007 -0700

    m68k: pmu_queue_request() declaration conflict
    Fixes a "static qualifier follows non-static qualifier" error from gcc 4.
    Signed-off-by: Finn Thain <[EMAIL PROTECTED]>
    Signed-off-by: Roman Zippel <[EMAIL PROTECTED]>
    Signed-off-by: Geert Uytterhoeven <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 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 356c721..dfdf11c 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 
 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 
 pmu_queue_request(struct adb_request *req)
        unsigned long flags;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to