Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / drivers / video / i810 / i810.h

diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h
index f59af3335ccf66a3aba24ee74455bb15b1cf0a97..579195c2bea3030bbd2922158cd3289c683d67cf 100644 (file)
--- a/drivers/video/i810/i810.h
+++ b/drivers/video/i810/i810.h
@@ -16,6 +16,9 @@
 #include <linux/list.h>
 #include <linux/agp_backend.h>
 #include <linux/fb.h>
+#include <linux/i2c.h>
+#include <linux/i2c-id.h>
+#include <linux/i2c-algo-bit.h>
 #include <video/vga.h>
 
 /* Fence */
@@ -240,6 +243,15 @@ struct state_registers {
        u8 cr39, cr41, cr70, sr01, msr;
 };
 
+struct i810fb_par;
+
+struct i810fb_i2c_chan {
+       struct i810fb_par *par;
+       struct i2c_adapter adapter;
+       struct i2c_algo_bit_data algo;
+       unsigned long ddc_base;
+};
+
 struct i810fb_par {
        struct mode_registers    regs;
        struct state_registers   hw_state;
@@ -251,10 +263,12 @@ struct i810fb_par {
        struct heap_data         iring;
        struct heap_data         cursor_heap;
        struct vgastate          state;
+       struct i810fb_i2c_chan   chan[3];
        atomic_t                 use_count;
        u32 pseudo_palette[17];
        unsigned long mmio_start_phys;
        u8 __iomem *mmio_start_virtual;
+       u8 *edid;
        u32 pitch;
        u32 pixconf;
        u32 watermark;
@@ -266,6 +280,7 @@ struct i810fb_par {
        u32 blit_bpp;
        u32 ovract;
        u32 cur_state;
+       u32 ddc_num;
        int mtrr_reg;
        u16 bltcntl;
        u8 interlace;