From e1acedd2ce68a47792b506f9b1cc485b598b21bd Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Sun, 20 Jan 2013 10:24:27 +0000 Subject: [PATCH] --- yaml --- r: 351015 b: refs/heads/master c: 741220ea86709717e1d392b5a9617dfe90cd3802 h: refs/heads/master i: 351013: cc5b1f45ace0bc1b5854227952eef2efad0ffccc 351011: 1f04da82de289b553051b2cbcca8bbd14f0ceacf 351007: 74ef8cf58d95c6e7d3a88a8f6c54b70d0fa4af49 v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/Makefile | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d0b7a7eb0fed..5f3533cff1b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c40a4518166b6c500c844579ec7069d4a0419f30 +refs/heads/master: 741220ea86709717e1d392b5a9617dfe90cd3802 diff --git a/trunk/drivers/cpufreq/Makefile b/trunk/drivers/cpufreq/Makefile index fadc4d496e2f..24d4a63fd6cf 100644 --- a/trunk/drivers/cpufreq/Makefile +++ b/trunk/drivers/cpufreq/Makefile @@ -19,11 +19,12 @@ obj-$(CONFIG_GENERIC_CPUFREQ_CPU0) += cpufreq-cpu0.o ################################################################################## # x86 drivers. # Link order matters. K8 is preferred to ACPI because of firmware bugs in early -# K8 systems. ACPI is preferred to all other hardware-specific drivers. +# K8 systems. This is still the case but acpi-cpufreq errors out so that +# powernow-k8 can load then. ACPI is preferred to all other hardware-specific drivers. # speedstep-* is preferred over p4-clockmod. -obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o mperf.o +obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o obj-$(CONFIG_X86_PCC_CPUFREQ) += pcc-cpufreq.o obj-$(CONFIG_X86_POWERNOW_K6) += powernow-k6.o obj-$(CONFIG_X86_POWERNOW_K7) += powernow-k7.o