From: Ard Biesheuvel ard.biesheuvel@linaro.org
Move the ACPI WMI BMOF driver to generic code, so that ARM-based Lenovo Yoga laptops can make use of it.
Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org Signed-off-by: Dimitri John Ledkov xnox@ubuntu.com --- drivers/acpi/Kconfig | 12 ++++++++++++ drivers/acpi/Makefile | 1 + drivers/{platform/x86 => acpi}/wmi-bmof.c | 0 drivers/platform/x86/Kconfig | 12 ------------ drivers/platform/x86/Makefile | 1 - 5 files changed, 13 insertions(+), 13 deletions(-) rename drivers/{platform/x86 => acpi}/wmi-bmof.c (100%)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 8955bdd8d693..e6321e3d4200 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -597,6 +597,18 @@ config ACPI_WMI It is safe to enable this driver even if your DSDT doesn't define any ACPI-WMI devices.
+config WMI_BMOF + tristate "WMI embedded Binary MOF driver" + depends on ACPI_WMI + default ACPI_WMI + ---help--- + Say Y here if you want to be able to read a firmware-embedded + WMI Binary MOF data. Using this requires userspace tools and may be + rather tedious. + + To compile this driver as a module, choose M here: the module will + be called wmi-bmof. + endif # ACPI
config X86_PM_TIMER diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 480ae10374de..6ee1f1bdb499 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -95,6 +95,7 @@ obj-$(CONFIG_ACPI_SPCR_TABLE) += spcr.o obj-$(CONFIG_ACPI_DEBUGGER_USER) += acpi_dbg.o obj-$(CONFIG_ACPI_PPTT) += pptt.o obj-$(CONFIG_ACPI_WMI) += wmi.o +obj-$(CONFIG_WMI_BMOF) += wmi-bmof.o
# processor has its own "processor." module_param namespace processor-y := processor_driver.o diff --git a/drivers/platform/x86/wmi-bmof.c b/drivers/acpi/wmi-bmof.c similarity index 100% rename from drivers/platform/x86/wmi-bmof.c rename to drivers/acpi/wmi-bmof.c diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 74421eacb5e6..6f98d354416f 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -747,18 +747,6 @@ config ASUS_WIRELESS If you choose to compile this driver as a module the module will be called asus-wireless.
-config WMI_BMOF - tristate "WMI embedded Binary MOF driver" - depends on ACPI_WMI - default ACPI_WMI - ---help--- - Say Y here if you want to be able to read a firmware-embedded - WMI Binary MOF data. Using this requires userspace tools and may be - rather tedious. - - To compile this driver as a module, choose M here: the module will - be called wmi-bmof. - config INTEL_WMI_THUNDERBOLT tristate "Intel WMI thunderbolt force power driver" depends on ACPI_WMI diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 09a7c704004d..661fe424ad6a 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -49,7 +49,6 @@ obj-$(CONFIG_MSI_WMI) += msi-wmi.o obj-$(CONFIG_PEAQ_WMI) += peaq-wmi.o obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o -obj-$(CONFIG_WMI_BMOF) += wmi-bmof.o obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o obj-$(CONFIG_XIAOMI_WMI) += xiaomi-wmi.o