summaryrefslogtreecommitdiff
path: root/drivers/video/i810/i810.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-11 13:51:24 +0300
committerJeff Garzik <jgarzik@pobox.com>2005-11-11 13:51:24 +0300
commit3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch)
treec4a5236cee8eb7418770802313d36a55f1cc0b1e /drivers/video/i810/i810.h
parent7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (diff)
parent5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff)
downloadlinux-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.tar.xz
Merge branch 'master'
Diffstat (limited to 'drivers/video/i810/i810.h')
-rw-r--r--drivers/video/i810/i810.h3
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;