Merge remote-tracking branch 'agust/next' into next

[karo-tx-linux.git] / drivers / video / i810 / i810_main.c

diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 038192ac73694aa8a367b7d5d536c7be9f7c9b57..bb674e431741cea2f4c53089ab97169364206946 100644 (file)
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -2011,9 +2011,7 @@ static int i810fb_init_pci(struct pci_dev *dev,
        struct fb_info    *info;
        struct i810fb_par *par = NULL;
        struct fb_videomode mode;
-       int i, err = -1, vfreq, hfreq, pixclock;
-
-       i = 0;
+       int err = -1, vfreq, hfreq, pixclock;
 
        info = framebuffer_alloc(sizeof(struct i810fb_par), &dev->dev);
        if (!info)