Merge tag 'platform-drivers-x86-v4.15-1' of git://git.infradead.org/linux-platform...

[sfrench/cifs-2.6.git] / drivers / platform / x86 / thinkpad_acpi.c

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 91fab1a13a6d9d62fb4bb5f712d24d0bcaadd06d..117be48ff4de9a3a70df898565cf6495e92d7ddd 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -9649,7 +9649,7 @@ static struct ibm_init_struct ibms_init[] __initdata = {
        },
 };
 
-static int __init set_ibm_param(const char *val, struct kernel_param *kp)
+static int __init set_ibm_param(const char *val, const struct kernel_param *kp)
 {
        unsigned int i;
        struct ibm_struct *ibm;