diff options
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 81aec8d66fd0..6155eeb2e89a 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -26,8 +26,7 @@ extern struct acpi_device *acpi_root; | |||
26 | 26 | ||
27 | #define ACPI_IS_ROOT_DEVICE(device) (!(device)->parent) | 27 | #define ACPI_IS_ROOT_DEVICE(device) (!(device)->parent) |
28 | 28 | ||
29 | /* Should be const */ | 29 | static const char *dummy_hid = "device"; |
30 | static char* dummy_hid = "device"; | ||
31 | 30 | ||
32 | static LIST_HEAD(acpi_device_list); | 31 | static LIST_HEAD(acpi_device_list); |
33 | static LIST_HEAD(acpi_bus_id_list); | 32 | static LIST_HEAD(acpi_bus_id_list); |
@@ -1021,7 +1020,7 @@ static int acpi_dock_match(struct acpi_device *device) | |||
1021 | return acpi_get_handle(device->handle, "_DCK", &tmp); | 1020 | return acpi_get_handle(device->handle, "_DCK", &tmp); |
1022 | } | 1021 | } |
1023 | 1022 | ||
1024 | char *acpi_device_hid(struct acpi_device *device) | 1023 | const char *acpi_device_hid(struct acpi_device *device) |
1025 | { | 1024 | { |
1026 | struct acpi_hardware_id *hid; | 1025 | struct acpi_hardware_id *hid; |
1027 | 1026 | ||