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 /arch/x86/kernel/cpu | |
| 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 'arch/x86/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c index 705e13a30781..b6434a7ef8b2 100644 --- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | |||
| @@ -533,13 +533,13 @@ static int __init acpi_cpufreq_early_init(void) | |||
| 533 | */ | 533 | */ |
| 534 | static int bios_with_sw_any_bug; | 534 | static int bios_with_sw_any_bug; |
| 535 | 535 | ||
| 536 | static int sw_any_bug_found(struct dmi_system_id *d) | 536 | static int sw_any_bug_found(const struct dmi_system_id *d) |
| 537 | { | 537 | { |
| 538 | bios_with_sw_any_bug = 1; | 538 | bios_with_sw_any_bug = 1; |
| 539 | return 0; | 539 | return 0; |
| 540 | } | 540 | } |
| 541 | 541 | ||
| 542 | static struct dmi_system_id sw_any_bug_dmi_table[] = { | 542 | static const struct dmi_system_id sw_any_bug_dmi_table[] = { |
| 543 | { | 543 | { |
| 544 | .callback = sw_any_bug_found, | 544 | .callback = sw_any_bug_found, |
| 545 | .ident = "Supermicro Server X6DLP", | 545 | .ident = "Supermicro Server X6DLP", |