2 files changed, 11 insertions, 7 deletions

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 15fb758a9e52..7cafacdd12b0 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -195,6 +195,8 @@ static int pnp_bus_resume(struct device *dev)
 struct bus_type pnp_bus_type = {
         .name   = "pnp",
         .match  = pnp_bus_match,
+        .probe  = pnp_device_probe,
+        .remove = pnp_device_remove,
         .suspend = pnp_bus_suspend,
         .resume = pnp_bus_resume,
 };
@@ -215,8 +217,6 @@ int pnp_register_driver(struct pnp_driver *drv)
 
         drv->driver.name = drv->name;
         drv->driver.bus = &pnp_bus_type;
-        drv->driver.probe = pnp_device_probe;
-        drv->driver.remove = pnp_device_remove;
 
         count = driver_register(&drv->driver);
 
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 816479ad217b..f104577f73e0 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -27,12 +27,15 @@
 
 static int num = 0;
 
+/* We need only to blacklist devices that have already an acpi driver that
+ * can't use pnp layer. We don't need to blacklist device that are directly
+ * used by the kernel (PCI root, ...), as it is harmless and there were
+ * already present in pnpbios. But there is an exception for devices that
+ * have irqs (PIC, Timer) because we call acpi_register_gsi.
+ * Finaly only devices that have a CRS method need to be in this list.
+ */
 static char __initdata excluded_id_list[] =
-        "PNP0C0A," /* Battery */
-        "PNP0C0C,PNP0C0E,PNP0C0D," /* Button */
         "PNP0C09," /* EC */
-        "PNP0C0B," /* Fan */
-        "PNP0A03," /* PCI root */
         "PNP0C0F," /* Link device */
         "PNP0000," /* PIC */
         "PNP0100," /* Timer */
@@ -131,7 +134,8 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
         struct pnp_id *dev_id;
         struct pnp_dev *dev;
 
-        if (!ispnpidacpi(acpi_device_hid(device)) ||
+        status = acpi_get_handle(device->handle, "_CRS", &temp);
+        if (ACPI_FAILURE(status) || !ispnpidacpi(acpi_device_hid(device)) ||
                 is_exclusive_device(device))
                 return 0;