diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 15:54:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 15:54:09 -0700 |
| commit | 85bf20d18ac0cf6e729465efcb8758b5db2ec6c2 (patch) | |
| tree | 82e174c1655e50862ab89993f2955bf954ad469f /drivers/acpi/acpi_pnp.c | |
| parent | 526a4045c60fbaede88ec95a69a73059dff02160 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
| download | linux-85bf20d18ac0cf6e729465efcb8758b5db2ec6c2.tar.gz linux-85bf20d18ac0cf6e729465efcb8758b5db2ec6c2.tar.xz | |
Merge 3.16-rc5 into usb-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi/acpi_pnp.c')
| -rw-r--r-- | drivers/acpi/acpi_pnp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c index 6703c1fd993a..4ddb0dca56f6 100644 --- a/drivers/acpi/acpi_pnp.c +++ b/drivers/acpi/acpi_pnp.c @@ -14,6 +14,8 @@ #include <linux/module.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 */ |