diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
| commit | 067e2601d3c076abbf45db91261f9065eaa879b2 (patch) | |
| tree | 86c8d4b913873dbd3b4ff23562a3a8597984b4df /drivers/acpi/hed.c | |
| parent | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (diff) | |
| parent | 931830aa5c251e0803523213428f777a48bde254 (diff) | |
Merge branch 'for-4.3/gembird' into for-linus
Diffstat (limited to 'drivers/acpi/hed.c')
| -rw-r--r-- | drivers/acpi/hed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c index aafe3ca829c2..a322710b5ba4 100644 --- a/drivers/acpi/hed.c +++ b/drivers/acpi/hed.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include <linux/acpi.h> | 27 | #include <linux/acpi.h> |
| 28 | #include <acpi/hed.h> | 28 | #include <acpi/hed.h> |
| 29 | 29 | ||
| 30 | static struct acpi_device_id acpi_hed_ids[] = { | 30 | static const struct acpi_device_id acpi_hed_ids[] = { |
| 31 | {"PNP0C33", 0}, | 31 | {"PNP0C33", 0}, |
| 32 | {"", 0}, | 32 | {"", 0}, |
| 33 | }; | 33 | }; |