rk30 fb: fix waring initialization from incompatible pointer type in board_rk30_sdk.c
authoryxj <yxj@rock-chips.com>
Wed, 25 Apr 2012 11:55:42 +0000 (19:55 +0800)
committeryxj <yxj@rock-chips.com>
Wed, 25 Apr 2012 11:55:42 +0000 (19:55 +0800)
add __ATTR_NULL as the end  of array rkfb_attrs

arch/arm/mach-rk30/board-rk30-sdk.c
drivers/video/rockchip/rkfb_sysfs.c

index 03d7bbcddcfacbf3f79f8b0eaaf94891946fe221..dcbbc913213a2609454cf3db0dd7653ffc9873a1 100644 (file)
@@ -815,7 +815,7 @@ struct rk29fb_info lcdc1_screen_info = {
        #if defined(CONFIG_HDMI_RK30)
        .prop           = EXTEND,       //extend display device
        .lcd_info  = NULL,
-       .set_screen_info = hdmi_set_info,
+       .set_screen_info = hdmi_init_lcdc,
        #endif
 };
 #endif
index 17f8fafa746a5b7a24c5a2a64401dd5dcc08fbf1..1b6e74f6ff836d64584253b587d2a60744bff16a 100644 (file)
@@ -159,6 +159,7 @@ static struct device_attribute rkfb_attrs[] = {
        __ATTR(screen_info, S_IRUGO, show_screen_info, NULL),
        __ATTR(enable, S_IRUGO | S_IWUSR, show_fb_state, set_fb_state),
        __ATTR(overlay, S_IRUGO | S_IWUSR, show_overlay, set_overlay),
+       __ATTR_NULL,
 };
 
 int rkfb_create_sysfs(struct fb_info *fbi)