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 d48949ceaacc033988512bb6eb4dabf3e942a0e3..579195c2bea3030bbd2922158cd3289c683d67cf 100644 (file)
--- a/drivers/video/i810/i810.h
+++ b/drivers/video/i810/i810.h
@@ -249,6 +249,7 @@ 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 {
@@ -262,7 +263,7 @@ struct i810fb_par {
        struct heap_data         iring;
        struct heap_data         cursor_heap;
        struct vgastate          state;
-       struct i810fb_i2c_chan   chan[2];
+       struct i810fb_i2c_chan   chan[3];
        atomic_t                 use_count;
        u32 pseudo_palette[17];
        unsigned long mmio_start_phys;
@@ -279,6 +280,7 @@ struct i810fb_par {
        u32 blit_bpp;
        u32 ovract;
        u32 cur_state;
+       u32 ddc_num;
        int mtrr_reg;
        u16 bltcntl;
        u8 interlace;