aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2007-05-08 03:38:06 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:27 -0400
commit31990a9d2ed02cb7552e05bb8a99872df9fd04da (patch)
tree2d5edfc15995419e1893a14e8bb6b474a1a43c06
parentcf36a65b08969d3cff3c1c878b7e0fdf148379b7 (diff)
SIS USB2VGA Warning fix
drivers/usb/misc/sisusbvga/sisusb_con.c:1436: warning: initialization from incompatible pointer type Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/usb/misc/sisusbvga/sisusb_con.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c
index ef6c727ef5ef..5947afb0017e 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)
321/* interface routine */ 321/* interface routine */
322static u8 322static u8
323sisusbcon_build_attr(struct vc_data *c, u8 color, u8 intensity, 323sisusbcon_build_attr(struct vc_data *c, u8 color, u8 intensity,
324 u8 blink, u8 underline, u8 reverse) 324 u8 blink, u8 underline, u8 reverse, u8 unused)
325{ 325{
326 u8 attr = color; 326 u8 attr = color;
327 327