diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-11 22:18:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-11 22:18:45 -0400 |
| commit | 19ad7ae47e4ce4eb2a583e437d653a96da7897ac (patch) | |
| tree | 699fda69476d256aae62e44baf7f98495a353204 /drivers/misc/thinkpad_acpi.c | |
| parent | 1ce48904285fe4b0298864f9153a8502ebeac35c (diff) | |
| parent | 1855256c497ecfefc730df6032243f26855ce52c (diff) | |
Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
drivers/firmware: const-ify DMI API and internals
Diffstat (limited to 'drivers/misc/thinkpad_acpi.c')
| -rw-r--r-- | drivers/misc/thinkpad_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 0222bbaf7b76..6c0b2f0a51ab 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
| @@ -4448,7 +4448,7 @@ static void ibm_exit(struct ibm_struct *ibm) | |||
| 4448 | 4448 | ||
| 4449 | static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp) | 4449 | static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp) |
| 4450 | { | 4450 | { |
| 4451 | struct dmi_device *dev = NULL; | 4451 | const struct dmi_device *dev = NULL; |
| 4452 | char ec_fw_string[18]; | 4452 | char ec_fw_string[18]; |
| 4453 | 4453 | ||
| 4454 | if (!tp) | 4454 | if (!tp) |