From: Andrew Morton Cc: Greg KH Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton --- drivers/video/aty/atyfb_base.c | 2 +- drivers/video/chipsfb.c | 2 +- drivers/video/cyber2000fb.c | 2 +- drivers/video/i810/i810-i2c.c | 2 +- drivers/video/igafb.c | 2 +- drivers/video/matrox/matroxfb_base.c | 2 +- drivers/video/nvidia/nv_i2c.c | 2 +- drivers/video/pvr2fb.c | 2 +- drivers/video/savage/savagefb-i2c.c | 2 +- drivers/video/sstfb.c | 2 +- drivers/video/tridentfb.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff -puN drivers/video/aty/atyfb_base.c~gregkh-driver-fb-device-fixes drivers/video/aty/atyfb_base.c --- a/drivers/video/aty/atyfb_base.c~gregkh-driver-fb-device-fixes +++ a/drivers/video/aty/atyfb_base.c @@ -3578,7 +3578,7 @@ static int __devinit atyfb_pci_probe(str } par = info->par; info->fix = atyfb_fix; - info->device = &pdev->dev; + info->dev = &pdev->dev; par->pci_id = aty_chips[i].pci_id; par->res_start = res_start; par->res_size = res_size; diff -puN drivers/video/chipsfb.c~gregkh-driver-fb-device-fixes drivers/video/chipsfb.c --- a/drivers/video/chipsfb.c~gregkh-driver-fb-device-fixes +++ a/drivers/video/chipsfb.c @@ -435,7 +435,7 @@ chipsfb_pci_init(struct pci_dev *dp, con } pci_set_drvdata(dp, p); - p->device = &dp->dev; + p->dev = &dp->dev; init_chips(p, addr); diff -puN drivers/video/cyber2000fb.c~gregkh-driver-fb-device-fixes drivers/video/cyber2000fb.c --- a/drivers/video/cyber2000fb.c~gregkh-driver-fb-device-fixes +++ a/drivers/video/cyber2000fb.c @@ -1399,7 +1399,7 @@ static int __devinit cyberpro_common_pro h_sync / 1000, h_sync % 1000, v_sync); if (cfb->dev) - cfb->fb.device = &cfb->dev->dev; + cfb->fb.dev = &cfb->dev->dev; err = register_framebuffer(&cfb->fb); failed: diff -puN drivers/video/i810/i810-i2c.c~gregkh-driver-fb-device-fixes drivers/video/i810/i810-i2c.c --- a/drivers/video/i810/i810-i2c.c~gregkh-driver-fb-device-fixes +++ a/drivers/video/i810/i810-i2c.c @@ -199,7 +199,7 @@ int i810_probe_i2c_connector(struct fb_i break; } } else { - const u8 *e = fb_firmware_edid(info->device); + const u8 *e = fb_firmware_edid(info->dev); if (e != NULL) { DPRINTK("i810-i2c: Getting EDID from BIOS\n"); diff -puN drivers/video/igafb.c~gregkh-driver-fb-device-fixes drivers/video/igafb.c --- a/drivers/video/igafb.c~gregkh-driver-fb-device-fixes +++ a/drivers/video/igafb.c @@ -527,7 +527,7 @@ int __init igafb_init(void) info->var = default_var; info->fix = igafb_fix; info->pseudo_palette = (void *)(par + 1); - info->device = &pdev->dev; + info->dev = &pdev->dev; if (!iga_init(info, par)) { iounmap((void *)par->io_base); diff -puN drivers/video/matrox/matroxfb_base.c~gregkh-driver-fb-device-fixes drivers/video/matrox/matroxfb_base.c --- a/drivers/video/matrox/matroxfb_base.c~gregkh-driver-fb-device-fixes +++ a/drivers/video/matrox/matroxfb_base.c @@ -1882,7 +1882,7 @@ static int initMatrox2(WPMINFO struct bo /* We do not have to set currcon to 0... register_framebuffer do it for us on first console * and we do not want currcon == 0 for subsequent framebuffers */ - ACCESS_FBINFO(fbcon).device = &ACCESS_FBINFO(pcidev)->dev; + ACCESS_FBINFO(fbcon).dev = &ACCESS_FBINFO(pcidev)->dev; if (register_framebuffer(&ACCESS_FBINFO(fbcon)) < 0) { goto failVideoIO; } diff -puN drivers/video/nvidia/nv_i2c.c~gregkh-driver-fb-device-fixes drivers/video/nvidia/nv_i2c.c --- a/drivers/video/nvidia/nv_i2c.c~gregkh-driver-fb-device-fixes +++ a/drivers/video/nvidia/nv_i2c.c @@ -208,7 +208,7 @@ int nvidia_probe_i2c_connector(struct fb if (!edid && conn == 1) { /* try to get from firmware */ - const u8 *e = fb_firmware_edid(info->device); + const u8 *e = fb_firmware_edid(info->dev); if (e != NULL) { edid = kmalloc(EDID_LENGTH, GFP_KERNEL); diff -puN drivers/video/pvr2fb.c~gregkh-driver-fb-device-fixes drivers/video/pvr2fb.c --- a/drivers/video/pvr2fb.c~gregkh-driver-fb-device-fixes +++ a/drivers/video/pvr2fb.c @@ -937,7 +937,7 @@ static int __devinit pvr2fb_pci_probe(st pvr2_fix.mmio_start = pci_resource_start(pdev, 1); pvr2_fix.mmio_len = pci_resource_len(pdev, 1); - fb_info->device = &pdev->dev; + fb_info->dev = &pdev->dev; return pvr2fb_common_init(); } diff -puN drivers/video/savage/savagefb-i2c.c~gregkh-driver-fb-device-fixes drivers/video/savage/savagefb-i2c.c --- a/drivers/video/savage/savagefb-i2c.c~gregkh-driver-fb-device-fixes +++ a/drivers/video/savage/savagefb-i2c.c @@ -263,7 +263,7 @@ int savagefb_probe_i2c_connector(struct if (!edid) { /* try to get from firmware */ - const u8 *e = fb_firmware_edid(info->device); + const u8 *e = fb_firmware_edid(info->dev); if (e) { edid = kmalloc(EDID_LENGTH, GFP_KERNEL); diff -puN drivers/video/sstfb.c~gregkh-driver-fb-device-fixes drivers/video/sstfb.c --- a/drivers/video/sstfb.c~gregkh-driver-fb-device-fixes +++ a/drivers/video/sstfb.c @@ -1495,7 +1495,7 @@ static int __devinit sstfb_probe(struct fb_alloc_cmap(&info->cmap, 256, 0); /* register fb */ - info->device = &pdev->dev; + info->dev = &pdev->dev; if (register_framebuffer(info) < 0) { eprintk("can't register framebuffer.\n"); goto fail; diff -puN drivers/video/tridentfb.c~gregkh-driver-fb-device-fixes drivers/video/tridentfb.c --- a/drivers/video/tridentfb.c~gregkh-driver-fb-device-fixes +++ a/drivers/video/tridentfb.c @@ -1171,7 +1171,7 @@ static int __devinit trident_pci_probe(s default_var.accel_flags &= ~FB_ACCELF_TEXT; default_var.activate |= FB_ACTIVATE_NOW; fb_info.var = default_var; - fb_info.device = &dev->dev; + fb_info.dev = &dev->dev; if (register_framebuffer(&fb_info) < 0) { printk(KERN_ERR "tridentfb: could not register Trident framebuffer\n"); return -EINVAL; _