i2c: Remove unneeded inclusions of <linux/i2c-id.h>

[cascardo/linux.git] / drivers / video / savage / savagefb.h

diff --git a/drivers/video/savage/savagefb.h b/drivers/video/savage/savagefb.h
index e648a6c..e4c3f21 100644 (file)
--- a/drivers/video/savage/savagefb.h
+++ b/drivers/video/savage/savagefb.h
@@ -13,8 +13,9 @@
 #define __SAVAGEFB_H__
 
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/i2c-algo-bit.h>
+#include <linux/mutex.h>
+#include <video/vga.h>
 #include "../edid.h"
 
 #ifdef SAVAGEFB_DEBUG
@@ -189,8 +190,12 @@ struct savagefb_par {
        struct savagefb_i2c_chan chan;
        struct savage_reg state;
        struct savage_reg save;
+       struct savage_reg initial;
+       struct vgastate vgastate;
+       struct mutex open_lock;
        unsigned char   *edid;
        u32 pseudo_palette[16];
+       u32 open_count;
        int paletteEnabled;
        int pm_state;
        int display_type;
@@ -203,7 +208,7 @@ struct savagefb_par {
        int clock[4];
        int MCLK, REFCLK, LCDclk;
        struct {
-               u8   __iomem *vbase;
+               void   __iomem *vbase;
                u32    pbase;
                u32    len;
 #ifdef CONFIG_MTRR
@@ -212,7 +217,7 @@ struct savagefb_par {
        } video;
 
        struct {
-               volatile u8  __iomem *vbase;
+               void  __iomem *vbase;
                u32           pbase;
                u32           len;
        } mmio;