linux-next: manual merge of the driver-core tree with the hwmon-staging tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/hwmon/ibmpowernv.c between commit e349d9d5b3f9 ("hwmon:
(ibmpowernv) Use platform 'id_table' to probe the device") from the
hwmon-staging tree and commit 2a1ed077189a ("hwmon: drop owner
assignment from platform_drivers") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/hwmon/ibmpowernv.c
index c7577b8f17a8,58ea44ec6c77..000000000000
--- a/drivers/hwmon/ibmpowernv.c
+++ b/drivers/hwmon/ibmpowernv.c
@@@ -301,20 -309,9 +301,19 @@@ static int ibmpowernv_probe(struct plat
        return PTR_ERR_OR_ZERO(hwmon_dev);
  }
  
 +static const struct platform_device_id opal_sensor_driver_ids[] = {
 +      {
 +              .name = "opal-sensor",
 +      },
 +      { }
 +};
 +MODULE_DEVICE_TABLE(platform, opal_sensor_driver_ids);
 +
  static struct platform_driver ibmpowernv_driver = {
 -      .driver = {
 -              .name = DRVNAME,
 +      .probe          = ibmpowernv_probe,
 +      .id_table       = opal_sensor_driver_ids,
 +      .driver         = {
-               .owner  = THIS_MODULE,
 +              .name   = DRVNAME,
        },
  };
  

pgpyQUA9hduv_.pgp
Description: OpenPGP digital signature