Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de3ed81d authored by Matthew Garrett's avatar Matthew Garrett Committed by Dave Jones
Browse files

[CPUFREQ] Change link order of x86 cpufreq modules 



Change the link order of the cpufreq modules to ensure that they're
probed in the preferred order when statically linked in.

Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent a75603a0

arch/x86/kernel/cpu/cpufreq/Makefile

+6 −2
Original line number Diff line number Diff line 
# 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.

# speedstep-* is preferred over p4-clockmod.



obj-$(CONFIG_X86_POWERNOW_K8)		+= powernow-k8.o

obj-$(CONFIG_X86_ACPI_CPUFREQ)		+= acpi-cpufreq.o

obj-$(CONFIG_X86_POWERNOW_K6)		+= powernow-k6.o

obj-$(CONFIG_X86_POWERNOW_K7)		+= powernow-k7.o

obj-$(CONFIG_X86_POWERNOW_K8)		+= powernow-k8.o

obj-$(CONFIG_X86_LONGHAUL)		+= longhaul.o

obj-$(CONFIG_X86_E_POWERSAVER)		+= e_powersaver.o

obj-$(CONFIG_ELAN_CPUFREQ)		+= elanfreq.o
@@ -10,7 +15,6 @@ obj-$(CONFIG_X86_GX_SUSPMOD) += gx-suspmod.o 
obj-$(CONFIG_X86_SPEEDSTEP_ICH)		+= speedstep-ich.o

obj-$(CONFIG_X86_SPEEDSTEP_LIB)		+= speedstep-lib.o

obj-$(CONFIG_X86_SPEEDSTEP_SMI)		+= speedstep-smi.o

obj-$(CONFIG_X86_ACPI_CPUFREQ)		+= acpi-cpufreq.o

obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO)	+= speedstep-centrino.o

obj-$(CONFIG_X86_P4_CLOCKMOD)		+= p4-clockmod.o

obj-$(CONFIG_X86_CPUFREQ_NFORCE2)	+= cpufreq-nforce2.o