Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / video / chipsfb.c

diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 777389c40988812c29f5ad31c7c04cc700f6f690..57b9d276497ed07e485311f38e95c6ef86af870e 100644 (file)
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -414,7 +414,6 @@ chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
        }
 
        pci_set_drvdata(dp, p);
-       p->device = &dp->dev;
 
        init_chips(p, addr);