Merge branches 'acpica-release-fixes', 'ec-fix', 'dock', 'irq-bounds', 'thermal-fix...

[linux-2.6-omap-h63xx.git] / include / video / neomagic.h

diff --git a/include/video/neomagic.h b/include/video/neomagic.h
index 1d69049bd4c196ee13ab3e7a6439d20d5cf47008..38910da0ae59f083c27312674413c73e4a32034b 100644 (file)
--- a/include/video/neomagic.h
+++ b/include/video/neomagic.h
@@ -90,23 +90,6 @@
 #define PCI_CHIP_NM2360 0x0006
 #define PCI_CHIP_NM2380 0x0016
 
-
-struct xtimings {
-       unsigned int pixclock;
-       unsigned int HDisplay;
-       unsigned int HSyncStart;
-       unsigned int HSyncEnd;
-       unsigned int HTotal;
-       unsigned int VDisplay;
-       unsigned int VSyncStart;
-       unsigned int VSyncEnd;
-       unsigned int VTotal;
-       unsigned int sync;
-       int dblscan;
-       int interlaced;
-};
-
-
 /* --------------------------------------------------------------------- */
 
 typedef volatile struct {
@@ -140,7 +123,8 @@ typedef volatile struct {
 
 struct neofb_par {
        struct vgastate state;
-       atomic_t ref_count;
+       struct mutex open_lock;
+       unsigned int ref_count;
 
        unsigned char MiscOutReg;       /* Misc */
        unsigned char CRTC[25];         /* Crtc Controller */
@@ -159,6 +143,7 @@ struct neofb_par {
        unsigned char PanelDispCntlReg1;
        unsigned char PanelDispCntlReg2;
        unsigned char PanelDispCntlReg3;
+       unsigned char PanelDispCntlRegRead;
        unsigned char PanelVertCenterReg1;
        unsigned char PanelVertCenterReg2;
        unsigned char PanelVertCenterReg3;