diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-08 12:05:34 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-08 12:05:34 +0000 |
| commit | 73c5fb6887d21bdbe4c5aec07f132e0010a554da (patch) | |
| tree | 29aed676055bf337c38c7be489cb544df9fe9c1e /linux/drivers/media/video/tvp5150.c | |
| parent | 1dcaf3c6fe06fdbc838908e5b109d9c9aa510835 (diff) | |
| download | mediapointer-dvb-s2-73c5fb6887d21bdbe4c5aec07f132e0010a554da.tar.gz mediapointer-dvb-s2-73c5fb6887d21bdbe4c5aec07f132e0010a554da.tar.bz2 | |
i2c fixes and cleanups
- Miscelaneous i2c cleanups and fixes to work with kernel >2.6.15
- linux/sound/pci/bt87x.c updated to kernel version.
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/tvp5150.c')
| -rw-r--r-- | linux/drivers/media/video/tvp5150.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c index a758caea2..8dff50ff5 100644 --- a/linux/drivers/media/video/tvp5150.c +++ b/linux/drivers/media/video/tvp5150.c @@ -1091,7 +1091,9 @@ static struct i2c_driver driver; static struct i2c_client client_template = { .name = "(unset)", +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) .flags = I2C_CLIENT_ALLOW_USE, +#endif .driver = &driver, }; @@ -1190,14 +1192,18 @@ static int tvp5150_detach_client(struct i2c_client *c) /* ----------------------------------------------------------------------- */ static struct i2c_driver driver = { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)) .owner = THIS_MODULE, #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) .name = "tvp5150", - - /* FIXME */ - .id = I2C_DRIVERID_SAA7110, .flags = I2C_DF_NOTIFY, +#else + .driver = { + .name = "tvp5150", + }, +#endif + .id = I2C_DRIVERID_TVP5150, .attach_adapter = tvp5150_attach_adapter, .detach_client = tvp5150_detach_client, |