Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / video / fbdev / hyperv_fb.c

diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
index 4254336..807ee22 100644 (file)
--- a/drivers/video/fbdev/hyperv_fb.c
+++ b/drivers/video/fbdev/hyperv_fb.c
@@ -415,7 +415,8 @@ static int synthvid_negotiate_ver(struct hv_device *hdev, u32 ver)
        struct fb_info *info = hv_get_drvdata(hdev);
        struct hvfb_par *par = info->par;
        struct synthvid_msg *msg = (struct synthvid_msg *)par->init_buf;
-       int t, ret = 0;
+       int ret = 0;
+       unsigned long t;
 
        memset(msg, 0, sizeof(struct synthvid_msg));
        msg->vid_hdr.type = SYNTHVID_VERSION_REQUEST;
@@ -488,7 +489,8 @@ static int synthvid_send_config(struct hv_device *hdev)
        struct fb_info *info = hv_get_drvdata(hdev);
        struct hvfb_par *par = info->par;
        struct synthvid_msg *msg = (struct synthvid_msg *)par->init_buf;
-       int t, ret = 0;
+       int ret = 0;
+       unsigned long t;
 
        /* Send VRAM location */
        memset(msg, 0, sizeof(struct synthvid_msg));