diff options
| author | Michael Krufky <devnull@localhost> | 2005-09-13 20:11:39 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-09-13 20:11:39 +0000 |
| commit | ee00178882ec47730e5d8f651135e482fa6f0cce (patch) | |
| tree | 6c3791a3920a4979ae7da6b5402996253f3e84d5 /linux/drivers/media/video/bt832.c | |
| parent | 450243867592096fe2ddde2134fd3f9c5c29c6b4 (diff) | |
| download | mediapointer-dvb-s2-ee00178882ec47730e5d8f651135e482fa6f0cce.tar.gz mediapointer-dvb-s2-ee00178882ec47730e5d8f651135e482fa6f0cce.tar.bz2 | |
* bt832.c: (bt832_probe):
* bttv-i2c.c: (attach_inform):
* cx88-i2c.c: (attach_inform), (detach_inform):
* id.h:
* ir-kbd-i2c.c: (ir_probe):
* msp3400.c: (msp34xx_sleep), (msp_attach):
* saa6588.c:
* saa6752hs.c:
* saa7134-i2c.c: (attach_inform):
* saa7134-tvaudio.c: (tvaudio_sleep):
* tda7432.c: (tda7432_probe):
* tda9875.c: (tda9875_probe):
* tda9887.c: (tda9887_probe):
* tuner-core.c:
* tveeprom.c: (tveeprom_attach_adapter):
* tvmixer.c: (tvmixer_ioctl), (tvmixer_clients),
(tvmixer_cleanup_module):
* video-buf.c: (videobuf_dma_free):
- Step two, in preparation for 2.6.14-rcX compatability:
- Compile tested against vanila kernels 2.6.13 & 2.6.8
- 2.6.14 compile still broken...
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers/media/video/bt832.c')
| -rw-r--r-- | linux/drivers/media/video/bt832.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/video/bt832.c b/linux/drivers/media/video/bt832.c index 348c1f4c0..a10e3136f 100644 --- a/linux/drivers/media/video/bt832.c +++ b/linux/drivers/media/video/bt832.c @@ -214,7 +214,7 @@ static int bt832_probe(struct i2c_adapter *adap) if (adap->class & I2C_CLASS_TV_ANALOG) return i2c_probe(adap, &addr_data, bt832_attach); #else - if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) + if (adap->id == I2C_HW_B_BT848) return i2c_probe(adap, &addr_data, bt832_attach); #endif return 0; @@ -263,18 +263,18 @@ static struct i2c_driver driver = { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,54) .owner = THIS_MODULE, #endif - .name = "i2c bt832 driver", - .id = -1, /* FIXME */ - .flags = I2C_DF_NOTIFY, - .attach_adapter = bt832_probe, - .detach_client = bt832_detach, - .command = bt832_command, + .name = "i2c bt832 driver", + .id = -1, /* FIXME */ + .flags = I2C_DF_NOTIFY, + .attach_adapter = bt832_probe, + .detach_client = bt832_detach, + .command = bt832_command, }; static struct i2c_client client_template = { - I2C_DEVNAME("bt832"), + .name = "bt832", .flags = I2C_CLIENT_ALLOW_USE, - .driver = &driver, + .driver = &driver, }; |