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 fb765524cc3d5acc754a60427533f1a15fb78b69..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 */