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/msp3400-driver.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/msp3400-driver.c')
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index bb470fc83..fafaccd60 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -125,10 +125,8 @@ static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END }; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; #endif - I2C_CLIENT_INSMOD; - /* ----------------------------------------------------------------------- */ /* functions for talking to the MSP3400C Sound processor */ @@ -1046,7 +1044,9 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind) client->addr = address; client->adapter = adapter; client->driver = &i2c_driver; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) client->flags = I2C_CLIENT_ALLOW_USE; +#endif snprintf(client->name, sizeof(client->name) - 1, "msp3400"); if (msp_reset(client) == -1) { @@ -1231,7 +1231,7 @@ static struct i2c_driver i2c_driver = { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) .driver = { #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) - .name = "msp3400", + .name = "msp3400", #endif .suspend = msp_suspend, .resume = msp_resume, |