Commit 3744b084 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

Merge a cpufreq fix for 6.13:

 - Fix cpufreq Kconfig breakage after previous changes (Viresh Kumar).

* pm-cpufreq:
  cpufreq: Move endif to the end of Kconfig file
parents 5a597a19 7e265fc0

drivers/cpufreq/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -325,8 +325,6 @@ config QORIQ_CPUFREQ 
	  This adds the CPUFreq driver support for Freescale QorIQ SoCs

	  which are capable of changing the CPU's frequency dynamically.



endif



config ACPI_CPPC_CPUFREQ

	tristate "CPUFreq driver based on the ACPI CPPC spec"

	depends on ACPI_PROCESSOR
@@ -355,4 +353,6 @@ config ACPI_CPPC_CPUFREQ_FIE 


	  If in doubt, say N.



endif



endmenu