Merge branch 'pm-domains'

[cascardo/linux.git] / drivers / acpi / acpi_pnp.c

diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c
index 996fa19..b193f84 100644 (file)
--- a/drivers/acpi/acpi_pnp.c
+++ b/drivers/acpi/acpi_pnp.c
@@ -15,8 +15,6 @@
 #include <linux/ctype.h>
 
 static const struct acpi_device_id acpi_pnp_device_ids[] = {
-       /* soc_button_array */
-       {"PNP0C40"},
        /* pata_isapnp */
        {"PNP0600"},            /* Generic ESDI/IDE/ATA compatible hard disk controller */
        /* floppy */
@@ -132,10 +130,6 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
        {"PNP0401"},            /* ECP Printer Port */
        /* apple-gmux */
        {"APP000B"},
-       /* fujitsu-laptop.c */
-       {"FUJ02bf"},
-       {"FUJ02B1"},
-       {"FUJ02E3"},
        /* system */
        {"PNP0c02"},            /* General ID for reserving resources */
        {"PNP0c01"},            /* memory controller */