summaryrefslogtreecommitdiff
path: root/drivers/video/geode/geodefb.h
diff options
context:
space:
mode:
authorGreg KH <gregkh@suse.de>2005-09-12 23:45:04 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-12 23:45:04 +0400
commitd58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch)
treed9a7e35eb88fea6265d5aadcc3d4ed39122b052a /drivers/video/geode/geodefb.h
parent877599fdef5ea4a7dd1956e22fa9d6923add97f8 (diff)
parent2ade81473636b33aaac64495f89a7dc572c529f0 (diff)
downloadlinux-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.tar.xz
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/video/geode/geodefb.h')
-rw-r--r--drivers/video/geode/geodefb.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/geode/geodefb.h b/drivers/video/geode/geodefb.h
index b7bac0a526b3..ae04820e0c57 100644
--- 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;