Merge branch 'fixes' into linux-next

* fixes:
  ACPI: EC: Enable EC support on LoongArch by default
This commit is contained in:
Rafael J. Wysocki 2024-12-18 20:24:47 +01:00
commit 221e26452a
2 changed files with 3 additions and 3 deletions

View File

@ -135,10 +135,10 @@ config ACPI_REV_OVERRIDE_POSSIBLE
config ACPI_EC
bool "Embedded Controller"
depends on HAS_IOPORT
default X86
default X86 || LOONGARCH
help
This driver handles communication with the microcontroller
on many x86 laptops and other machines.
on many x86/LoongArch laptops and other machines.
config ACPI_EC_DEBUGFS
tristate "EC read/write access through /sys/kernel/debug/ec"

View File

@ -18,7 +18,7 @@ if LOONGARCH_PLATFORM_DEVICES
config LOONGSON_LAPTOP
tristate "Generic Loongson-3 Laptop Driver"
depends on ACPI
depends on ACPI_EC
depends on BACKLIGHT_CLASS_DEVICE
depends on INPUT
depends on MACH_LOONGSON64