summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2025-01-16 15:36:41 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2025-01-16 15:36:41 +0100
commit3744b08449c27bfa085aa218c4830f3996a51626 (patch)
tree5d48632582b8e2a346444c634531f9f0b098f880 /drivers
parentcpuidle: teo: Update documentation after previous changes (diff)
parentcpufreq: Move endif to the end of Kconfig file (diff)
downloadlinux-3744b08449c27bfa085aa218c4830f3996a51626.tar.xz
linux-3744b08449c27bfa085aa218c4830f3996a51626.zip
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 92a83a9bb2e1..26e98fea991a 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -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