diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:29:47 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:29:47 -0200 |
| commit | c3e004458c858a5cea7dc5a693c25b301c0a47a8 (patch) | |
| tree | b7aced58dd900d9afd01531ffefd1b00dffda92c /linux/include/media/v4l2-i2c-drv.h | |
| parent | df971dfe066837946222937b94068df80d1270f2 (diff) | |
| parent | 73718ca8bbd9619f9d42780499c63b32fd074052 (diff) | |
| download | mediapointer-dvb-s2-c3e004458c858a5cea7dc5a693c25b301c0a47a8.tar.gz mediapointer-dvb-s2-c3e004458c858a5cea7dc5a693c25b301c0a47a8.tar.bz2 | |
merge backout patch
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media/v4l2-i2c-drv.h')
| -rw-r--r-- | linux/include/media/v4l2-i2c-drv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/include/media/v4l2-i2c-drv.h b/linux/include/media/v4l2-i2c-drv.h index 726120399..09e5f8de5 100644 --- a/linux/include/media/v4l2-i2c-drv.h +++ b/linux/include/media/v4l2-i2c-drv.h @@ -38,7 +38,6 @@ struct v4l2_i2c_driver_data { }; static struct v4l2_i2c_driver_data v4l2_i2c_data; -static struct i2c_client_address_data addr_data; static struct i2c_driver v4l2_i2c_driver; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) @@ -59,6 +58,8 @@ static int __init v4l2_i2c_drv_init(void) #else +static struct i2c_client_address_data addr_data; + /* Bus-based I2C API is not present, add legacy code */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) |