Merge commit 'gcl/gcl-next'

[linux-2.6] / drivers / video / geode / geodefb.h

diff --git a/drivers/video/geode/geodefb.h b/drivers/video/geode/geodefb.h
index b7bac0a526b3814bd6ac5edac31215ce855fc6ad..ae04820e0c5773d74d46671dc79c69c86434516a 100644 (file)
--- a/drivers/video/geode/geodefb.h
+++ b/drivers/video/geode/geodefb.h
@@ -29,7 +29,6 @@ struct geodefb_par {
        int enable_crt;
        int panel_x; /* dimensions of an attached flat panel, non-zero => enable panel */
        int panel_y;
-       struct pci_dev *vid_dev;
        void __iomem *dc_regs;
        void __iomem *vid_regs;
        struct geode_dc_ops  *dc_ops;