diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2014-06-05 00:53:02 +0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-06-05 00:53:02 +0400 |
commit | f8647b506d7116a1a3accd8d618184096e85f50b (patch) | |
tree | f10bc7201fda2a36c035548a0ea62210ad57adb6 /drivers/acpi/acpi_platform.c | |
parent | 1d421ca9d7edbac1eb118631ee039d50ab54771e (diff) | |
parent | f7a89f1b8eb598ac5da61c9795b3d847baa73d12 (diff) | |
download | linux-f8647b506d7116a1a3accd8d618184096e85f50b.tar.xz |
Merge branch '3.15-fixes' into mips-for-linux-next
Diffstat (limited to 'drivers/acpi/acpi_platform.c')
-rw-r--r-- | drivers/acpi/acpi_platform.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index dbfe49e5fd63..1d4950388fa1 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -29,7 +29,6 @@ ACPI_MODULE_NAME("platform"); static const struct acpi_device_id acpi_platform_device_ids[] = { { "PNP0D40" }, - { "ACPI0003" }, { "VPC2004" }, { "BCM4752" }, |