diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 07:40:35 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 07:40:35 (GMT) |
| commit | f0b364a13d7fba001c0571d954f165dfaf5f434a (patch) | |
| tree | 9cd8bf4e800295e5dbf279e63b9793223fd20577 /arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | |
| parent | 5a73fdc5ea836d2edc5e02890b51185fe304d7d3 (diff) | |
| parent | bfeeb0f57940b143a55dcc7ee88e8842108d9145 (diff) | |
| download | linux-fsl-qoriq-f0b364a13d7fba001c0571d954f165dfaf5f434a.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] Make acpi-cpufreq unsticky again.
[CPUFREQ] longhaul: remove duplicated code.
[CPUFREQ] Longhaul - Disable arbiter CLE266
[CPUFREQ] Fix section mismatch warning
[CPUFREQ] Fix cut-n-paste bug in suspend printk
Diffstat (limited to 'arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c')
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c index ea19d09..57c880b 100644 --- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c @@ -396,13 +396,13 @@ static int acpi_cpufreq_early_init_acpi(void) */ static int bios_with_sw_any_bug; -static int __init sw_any_bug_found(struct dmi_system_id *d) +static int sw_any_bug_found(struct dmi_system_id *d) { bios_with_sw_any_bug = 1; return 0; } -static struct dmi_system_id __initdata sw_any_bug_dmi_table[] = { +static struct dmi_system_id sw_any_bug_dmi_table[] = { { .callback = sw_any_bug_found, .ident = "Supermicro Server X6DLP", @@ -597,7 +597,6 @@ static struct cpufreq_driver acpi_cpufreq_driver = { .name = "acpi-cpufreq", .owner = THIS_MODULE, .attr = acpi_cpufreq_attr, - .flags = CPUFREQ_STICKY, }; @@ -608,7 +607,7 @@ acpi_cpufreq_init (void) acpi_cpufreq_early_init_acpi(); - return cpufreq_register_driver(&acpi_cpufreq_driver); + return cpufreq_register_driver(&acpi_cpufreq_driver); } |