diff options
| author | Len Brown <len.brown@intel.com> | 2004-01-28 15:05:25 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-01-28 15:05:25 -0500 |
| commit | 4775e46ceceb4f738b1858127ed7c3ced337eec3 (patch) | |
| tree | e1efc80f7f3a93ffc7628100821c3e0d7b4b239b | |
| parent | cf9b129e5db461835f8b593a0c39182abba0bccc (diff) | |
| parent | bbb78a9ab051a4ba4429ce6955fbcf3e023021a2 (diff) | |
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.0
into intel.com:/home/lenb/src/linux-acpi-test-2.6.1
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 1 | ||||
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 0d8d0118665f..e083a61b6923 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -31,6 +31,7 @@ #include <asm/io_apic.h> #include <asm/apic.h> #include <asm/io.h> +#include <asm/irq.h> #include <asm/mpspec.h> #if defined (CONFIG_X86_LOCAL_APIC) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 25ba41b0f6a7..4e4361e34741 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -868,7 +868,7 @@ int cpufreq_update_policy(unsigned int cpu) down(&data->lock); memcpy(&policy, - &data, + data, sizeof(struct cpufreq_policy)); policy.min = data->user_policy.min; policy.max = data->user_policy.max; |