diff options
| author | Michael Hunold <devnull@localhost> | 2002-12-20 14:18:26 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2002-12-20 14:18:26 +0000 |
| commit | e62b273dd417c051d1624d6854414d6054e6a131 (patch) | |
| tree | 84cab0d55c55c4742a03eb8e6aad210def78f7e3 /linux/drivers/media/dvb/av7110 | |
| parent | df166bc1551ee91e374068939c2e58925db8064e (diff) | |
| download | mediapointer-dvb-s2-e62b273dd417c051d1624d6854414d6054e6a131.tar.gz mediapointer-dvb-s2-e62b273dd417c051d1624d6854414d6054e6a131.tar.bz2 | |
Removed the dependecy to i2c-core from saa7146 and av7110,
changed mxb to (un)register the i2c adapter by itself
Diffstat (limited to 'linux/drivers/media/dvb/av7110')
| -rw-r--r-- | linux/drivers/media/dvb/av7110/Kconfig | 1 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/av7110/av7110.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/av7110/Kconfig b/linux/drivers/media/dvb/av7110/Kconfig index 6b7e6961d..93270f079 100644 --- a/linux/drivers/media/dvb/av7110/Kconfig +++ b/linux/drivers/media/dvb/av7110/Kconfig @@ -23,4 +23,3 @@ config DVB_AV7110_OSD its menus, so say Y if you want to use this software. All other people say N. - diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c index e9126e36c..6fcc7fec7 100644 --- a/linux/drivers/media/dvb/av7110/av7110.c +++ b/linux/drivers/media/dvb/av7110/av7110.c @@ -4364,6 +4364,9 @@ int av7110_attach (struct saa7146_dev* dev) dvb_register_adapter(&adap, av7110->card_type->name); av7110->dvb_adapter = adap; + /* fixme: speed ok? */ + saa7146_i2c_adapter_prepare(dev, NULL, SAA7146_I2C_BUS_BIT_RATE_480); + av7110->i2c_bus = dvb_register_i2c_bus (master_xfer, dev, av7110->dvb_adapter, 0); if (!av7110->i2c_bus) { dvb_unregister_adapter (av7110->dvb_adapter); @@ -4640,7 +4643,6 @@ struct saa7146_extension av7110_extension = { .num_stds = sizeof(standard)/sizeof(struct saa7146_standard), .std_callback = NULL, - .use_kernel_i2c = 0, .vbi = NULL, .ioctls = &ioctls[0], |