Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/s390/char/vmlogrdr.c between commit
2a0217d5c7d22d6dd28f8ae5d20b06d24dc426b8 ("[S390] bus_id -> dev_name
conversions") from Linus' tree and commit
1ad49a066d3a1627b7a640117804a1058fc55aa0 ("device create: s390: convert
device_create_drvdata to device_create") from the driver-core tree.
I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/s390/char/vmlogrdr.c
index 42173cc,9775acb..0000000
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@@ -747,10 -748,10 +747,10 @@@ static int vmlogrdr_register_device(str
device_unregister(dev);
return ret;
}
- priv->class_device = device_create_drvdata(vmlogrdr_class, dev,
- MKDEV(vmlogrdr_major,
- priv->minor_num),
- priv, "%s", dev_name(dev));
+ priv->class_device = device_create(vmlogrdr_class, dev,
+ MKDEV(vmlogrdr_major,
+ priv->minor_num),
- priv, "%s", dev->bus_id);
++ priv, "%s", dev_name(dev));
if (IS_ERR(priv->class_device)) {
ret = PTR_ERR(priv->class_device);
priv->class_device=NULL;
Attachment:
pgp2MjUzIEZOP.pgp
Description: PGP signature
