Commit:     31990a9d2ed02cb7552e05bb8a99872df9fd04da
Parent:     cf36a65b08969d3cff3c1c878b7e0fdf148379b7
Author:     WANG Cong <[EMAIL PROTECTED]>
AuthorDate: Tue May 8 00:38:06 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue May 8 11:15:27 2007 -0700

    SIS USB2VGA Warning fix
    drivers/usb/misc/sisusbvga/sisusb_con.c:1436: warning: initialization from 
incompatible pointer type
    Signed-off-by: WANG Cong <[EMAIL PROTECTED]>
    Cc: "Antonino A. Daplas" <[EMAIL PROTECTED]>
    Cc: Jan Engelhardt <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/usb/misc/sisusbvga/sisusb_con.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c 
index ef6c727..5947afb 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_con.c
+++ b/drivers/usb/misc/sisusbvga/sisusb_con.c
@@ -321,7 +321,7 @@ sisusbcon_deinit(struct vc_data *c)
 /* interface routine */
 static u8
 sisusbcon_build_attr(struct vc_data *c, u8 color, u8 intensity,
-                           u8 blink, u8 underline, u8 reverse)
+                           u8 blink, u8 underline, u8 reverse, u8 unused)
        u8 attr = color;
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