Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

Two bits were appended to the end of the bitfield
list in struct scsi_device.  Resolve that conflict
by including both bits.

Conflicts:
	include/scsi/scsi_device.h

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index eb6408741a8f..215ecd097408 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -60,7 +60,6 @@ ACPI_MODULE_NAME("power");
 
 static int acpi_power_add(struct acpi_device *device);
 static int acpi_power_remove(struct acpi_device *device, int type);
-static int acpi_power_resume(struct acpi_device *device);
 
 static const struct acpi_device_id power_device_ids[] = {
         {ACPI_POWER_HID, 0},
@@ -68,6 +67,9 @@ static const struct acpi_device_id power_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, power_device_ids);
 
+static int acpi_power_resume(struct device *dev);
+static SIMPLE_DEV_PM_OPS(acpi_power_pm, NULL, acpi_power_resume);
+
 static struct acpi_driver acpi_power_driver = {
         .name = "power",
         .class = ACPI_POWER_CLASS,
@@ -75,8 +77,8 @@ static struct acpi_driver acpi_power_driver = {
         .ops = {
                 .add = acpi_power_add,
                 .remove = acpi_power_remove,
-                .resume = acpi_power_resume,
                 },
+        .drv.pm = &acpi_power_pm,
 };
 
 /*
@@ -773,14 +775,16 @@ static int acpi_power_remove(struct acpi_device *device, int type)
         return 0;
 }
 
-static int acpi_power_resume(struct acpi_device *device)
+static int acpi_power_resume(struct device *dev)
 {
         int result = 0, state;
+        struct acpi_device *device;
         struct acpi_power_resource *resource;
 
-        if (!device)
+        if (!dev)
                 return -EINVAL;
 
+        device = to_acpi_device(dev);
         resource = acpi_driver_data(device);
         if (!resource)
                 return -EINVAL;