2 files changed, 13 insertions, 3 deletions

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 527ee764c93f..cd11b113494f 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -135,6 +135,15 @@ static int pnp_device_remove(struct device *dev)
         return 0;
 }
 
+static void pnp_device_shutdown(struct device *dev)
+{
+        struct pnp_dev *pnp_dev = to_pnp_dev(dev);
+        struct pnp_driver *drv = pnp_dev->driver;
+
+        if (drv && drv->shutdown)
+                drv->shutdown(pnp_dev);
+}
+
 static int pnp_bus_match(struct device *dev, struct device_driver *drv)
 {
         struct pnp_dev *pnp_dev = to_pnp_dev(dev);
@@ -203,6 +212,7 @@ struct bus_type pnp_bus_type = {
         .match   = pnp_bus_match,
         .probe   = pnp_device_probe,
         .remove  = pnp_device_remove,
+        .shutdown = pnp_device_shutdown,
         .suspend = pnp_bus_suspend,
         .resume  = pnp_bus_resume,
         .dev_attrs = pnp_interface_attrs,
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 9496494f340e..c07fdb94d665 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -194,13 +194,13 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
                 pnpacpi_parse_resource_option_data(dev);
 
         if (device->flags.compatible_ids) {
-                struct acpi_compatible_id_list *cid_list = device->pnp.cid_list;
+                struct acpica_device_id_list *cid_list = device->pnp.cid_list;
                 int i;
 
                 for (i = 0; i < cid_list->count; i++) {
-                        if (!ispnpidacpi(cid_list->id[i].value))
+                        if (!ispnpidacpi(cid_list->ids[i].string))
                                 continue;
-                        pnp_add_id(dev, cid_list->id[i].value);
+                        pnp_add_id(dev, cid_list->ids[i].string);
                 }
         }