Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / drivers / misc / thinkpad_acpi.c

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index a717a25fb86a35505172dc559c33c6170a444fe9..216948dd71a55dd1b7f7f72b5c3f2cfa5588f8ab 100644 (file)
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -4448,7 +4448,7 @@ static void ibm_exit(struct ibm_struct *ibm)
 
 static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp)
 {
-       struct dmi_device *dev = NULL;
+       const struct dmi_device *dev = NULL;
        char ec_fw_string[18];
 
        if (!tp)