Skip to content

Commit 5100b6f

Browse files
committed
Merge tag 'acpi-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki: "Unbreak ACPI EC support on LoongArch that has been broken earlier in this development cycle (Huacai Chen)" * tag 'acpi-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: EC: Enable EC support on LoongArch by default
2 parents baa172c + 0674188 commit 5100b6f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/acpi/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ config ACPI_REV_OVERRIDE_POSSIBLE
135135
config ACPI_EC
136136
bool "Embedded Controller"
137137
depends on HAS_IOPORT
138-
default X86
138+
default X86 || LOONGARCH
139139
help
140140
This driver handles communication with the microcontroller
141-
on many x86 laptops and other machines.
141+
on many x86/LoongArch laptops and other machines.
142142

143143
config ACPI_EC_DEBUGFS
144144
tristate "EC read/write access through /sys/kernel/debug/ec"

drivers/platform/loongarch/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if LOONGARCH_PLATFORM_DEVICES
1818

1919
config LOONGSON_LAPTOP
2020
tristate "Generic Loongson-3 Laptop Driver"
21-
depends on ACPI
21+
depends on ACPI_EC
2222
depends on BACKLIGHT_CLASS_DEVICE
2323
depends on INPUT
2424
depends on MACH_LOONGSON64

0 commit comments

Comments
 (0)