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/sleep/main.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/sleep/main.c')
-rw-r--r-- | drivers/acpi/sleep/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 2cbb9aabd00e..5055acf2163c 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
@@ -215,7 +215,7 @@ static struct pm_ops acpi_pm_ops = { | |||
215 | * Toshiba fails to preserve interrupts over S1, reinitialization | 215 | * Toshiba fails to preserve interrupts over S1, reinitialization |
216 | * of 8259 is needed after S1 resume. | 216 | * of 8259 is needed after S1 resume. |
217 | */ | 217 | */ |
218 | static int __init init_ints_after_s1(struct dmi_system_id *d) | 218 | static int __init init_ints_after_s1(const struct dmi_system_id *d) |
219 | { | 219 | { |
220 | printk(KERN_WARNING "%s with broken S1 detected.\n", d->ident); | 220 | printk(KERN_WARNING "%s with broken S1 detected.\n", d->ident); |
221 | init_8259A_after_S1 = 1; | 221 | init_8259A_after_S1 = 1; |