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/acpi/osl.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/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 12c09fafce..352cf81af5 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -1214,7 +1214,7 @@ acpi_os_validate_address ( | |||
| 1214 | } | 1214 | } |
| 1215 | 1215 | ||
| 1216 | #ifdef CONFIG_DMI | 1216 | #ifdef CONFIG_DMI |
| 1217 | static int dmi_osi_linux(struct dmi_system_id *d) | 1217 | static int dmi_osi_linux(const struct dmi_system_id *d) |
| 1218 | { | 1218 | { |
| 1219 | printk(KERN_NOTICE "%s detected: enabling _OSI(Linux)\n", d->ident); | 1219 | printk(KERN_NOTICE "%s detected: enabling _OSI(Linux)\n", d->ident); |
| 1220 | enable_osi_linux(1); | 1220 | enable_osi_linux(1); |