Commit 5100b6f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents baa172c7 0674188f

drivers/acpi/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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"

drivers/platform/loongarch/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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