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/ir-kbd-i2c.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/ir-kbd-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-i2c.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c index 9641ad4db..631d58781 100644 --- a/linux/drivers/media/video/ir-kbd-i2c.c +++ b/linux/drivers/media/video/ir-kbd-i2c.c @@ -1,5 +1,5 @@ /* - * $Id: ir-kbd-i2c.c,v 1.11 2005/07/07 16:42:11 mchehab Exp $ + * $Id: ir-kbd-i2c.c,v 1.12 2005/09/13 20:11:39 mkrufky Exp $ * * keyboard input driver for i2c IR remote controls * @@ -317,7 +317,7 @@ static struct i2c_driver driver = { static struct i2c_client client_template = { - I2C_DEVNAME("unset"), + .name = "unset", .driver = &driver }; @@ -438,10 +438,14 @@ static int ir_probe(struct i2c_adapter *adap) struct i2c_client c; char buf; int i,rc; switch (adap->id) { - case I2C_ALGO_BIT | I2C_HW_B_BT848: + case I2C_HW_B_BT848: probe = probe_bttv; break; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) + case I2C_HW_SAA7134: +#else case I2C_ALGO_SAA7134: +#endif probe = probe_saa7134; break; } |