Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/pci/dm1105/dm1105.c between commit 598759dec35a ("Drivers:
media: remove __dev* attributes") from the driver-core.current tree and
commit 73f0af44a913 ("[media] make the other drivers take use of the new
ts2020 driver") from the v4l-dvb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/media/pci/dm1105/dm1105.c
index 904c3ea,79fe74a..0000000
--- a/drivers/media/pci/dm1105/dm1105.c
+++ b/drivers/media/pci/dm1105/dm1105.c
@@@ -849,7 -850,11 +850,11 @@@ static struct ds3000_config dvbworld_ds
.demod_address = 0x68,
};
+ static struct ts2020_config dvbworld_ts2020_config = {
+ .tuner_address = 0x60,
+ };
+
-static int __devinit frontend_init(struct dm1105_dev *dev)
+static int frontend_init(struct dm1105_dev *dev)
{
int ret;
Attachment:
pgpsUQroBCJ6y.pgp
Description: PGP signature
