[PATCH] i810fb: Cleanup I2C code

- The functions for reading the 1st and 2nd bus are essentially the same,
  except for the register.  Consolidate them all.

- According to Nicolas Boichat, there is an undocumented 3rd i2c bus for
  attaching daughter cards.  Add support for this.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h
index d48949ceaacc..6c187d5fe951 100644
--- 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;