These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / pnp / pnpacpi / core.c

diff --git a/kernel/drivers/pnp/pnpacpi/core.c b/kernel/drivers/pnp/pnpacpi/core.c
index 5153d1d..9113876 100644 (file)
--- a/kernel/drivers/pnp/pnpacpi/core.c
+++ b/kernel/drivers/pnp/pnpacpi/core.c
@@ -207,7 +207,7 @@ struct pnp_protocol pnpacpi_protocol = {
 };
 EXPORT_SYMBOL(pnpacpi_protocol);
 
-static char *__init pnpacpi_get_id(struct acpi_device *device)
+static const char *__init pnpacpi_get_id(struct acpi_device *device)
 {
        struct acpi_hardware_id *id;
 
@@ -222,7 +222,7 @@ static char *__init pnpacpi_get_id(struct acpi_device *device)
 static int __init pnpacpi_add_device(struct acpi_device *device)
 {
        struct pnp_dev *dev;
-       char *pnpid;
+       const char *pnpid;
        struct acpi_hardware_id *id;
        int error;