diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:01:54 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:01:54 -0200 |
| commit | d3cfa593f943f1404d84c0a16d57507541e1f2b1 (patch) | |
| tree | c915ce4107c8692f7d6e063c8b7f674a55777b0f /linux/include/media/v4l2-i2c-drv.h | |
| parent | c110c10d4a3e9573d3d8231df2eb2ab12e7d0824 (diff) | |
| parent | cdac3fcffa086178870fd6f48bc828d0ca878905 (diff) | |
| download | mediapointer-dvb-s2-d3cfa593f943f1404d84c0a16d57507541e1f2b1.tar.gz mediapointer-dvb-s2-d3cfa593f943f1404d84c0a16d57507541e1f2b1.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/pvrusb2
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) |