Merge tag 'v4.3-rc1' into MTD -next development

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / acpi_pnp.c

diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c
index ff6d8adc9cda69c4d0d1f9a22ff3481846020cbd..c58940b231d69df0c135bd5f821dbef64ef5755c 100644 (file)
--- a/drivers/acpi/acpi_pnp.c
+++ b/drivers/acpi/acpi_pnp.c
@@ -19,8 +19,6 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
        {"PNP0600"},            /* Generic ESDI/IDE/ATA compatible hard disk controller */
        /* floppy */
        {"PNP0700"},
-       /* ipmi_si */
-       {"IPI0001"},
        /* tpm_inf_pnp */
        {"IFX0101"},            /* Infineon TPMs */
        {"IFX0102"},            /* Infineon TPMs */
@@ -153,6 +151,7 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
        {"AEI0250"},            /* PROLiNK 1456VH ISA PnP K56flex Fax Modem */
        {"AEI1240"},            /* Actiontec ISA PNP 56K X2 Fax Modem */
        {"AKY1021"},            /* Rockwell 56K ACF II Fax+Data+Voice Modem */
+       {"ALI5123"},            /* ALi Fast Infrared Controller */
        {"AZT4001"},            /* AZT3005 PnP SOUND DEVICE */
        {"BDP3336"},            /* Best Data Products Inc. Smart One 336F PnP Modem */
        {"BRI0A49"},            /* Boca Complete Ofc Communicator 14.4 Data-FAX */