diff options
| author | Brandon Philips <brandon@ifup.org> | 2008-02-04 12:52:20 -0800 |
|---|---|---|
| committer | Brandon Philips <brandon@ifup.org> | 2008-02-04 12:52:20 -0800 |
| commit | 585e2c45351b12d0acfabbf83a99f5f43ef40fe6 (patch) | |
| tree | ee98b53f01f675aef0b419dfd087f28882132080 /linux | |
| parent | 7def2586b2e59194311664b119b23e310483c6c3 (diff) | |
| download | mediapointer-dvb-s2-585e2c45351b12d0acfabbf83a99f5f43ef40fe6.tar.gz mediapointer-dvb-s2-585e2c45351b12d0acfabbf83a99f5f43ef40fe6.tar.bz2 | |
[v4l] Fix v4l against 2.6.25 tree
This won't fix the build quite yet since SUBLEVEL hasn't been changed in the
Makefile for 2.6.25. But, there isn't much we can do without breaking the
build against 2.6.24 too...
Fixes the build against these two commits.
bdc511f438f6ca40307e06edda00331e6ac0f813
bfb6df24facfde7ec6191edbba798777efb3c375
Signed-off-by: Brandon Philips <bphilips@suse.de>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/ks0127.c | 1 | ||||
| -rw-r--r-- | linux/include/media/v4l2-i2c-drv-legacy.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ks0127.c b/linux/drivers/media/video/ks0127.c index b1d965bcd..90451230d 100644 --- a/linux/drivers/media/video/ks0127.c +++ b/linux/drivers/media/video/ks0127.c @@ -765,7 +765,6 @@ static struct i2c_client ks0127_client_tmpl = .addr = 0, .adapter = NULL, .driver = &i2c_driver_ks0127, - .usage_count = 0 }; static int ks0127_found_proc(struct i2c_adapter *adapter, int addr, int kind) diff --git a/linux/include/media/v4l2-i2c-drv-legacy.h b/linux/include/media/v4l2-i2c-drv-legacy.h index fa55a1479..812f18516 100644 --- a/linux/include/media/v4l2-i2c-drv-legacy.h +++ b/linux/include/media/v4l2-i2c-drv-legacy.h @@ -38,7 +38,11 @@ struct v4l2_i2c_driver_data { }; static struct v4l2_i2c_driver_data v4l2_i2c_data; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) +const static struct i2c_client_address_data addr_data; +#else static struct i2c_client_address_data addr_data; +#endif static struct i2c_driver v4l2_i2c_driver_legacy; static char v4l2_i2c_drv_name_legacy[32]; |