Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.1

into intel.com:/home/lenb/src/linux-acpi-test-2.6.2

Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.1
into intel.com:/home/lenb/src/linux-acpi-test-2.6.2
4ddc28a3 · Len Brown · 5f6fa7a7 · 4775e46c · 4ddc28a3 · 4ddc28a3
Commit 4ddc28a3 authored Jan 28, 2004 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

arch/i386/kernel/acpi/boot.c arch/i386/kernel/acpi/boot.c +1 -0

drivers/cpufreq/cpufreq.c drivers/cpufreq/cpufreq.c +1 -1

No files found.
--- 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)

--- 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;