Commit 7d033365 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

Move ACPI power meter driver to hwmon 



As discussed earlier, the ACPI power meter driver would better live
in drivers/hwmon, as its only purpose is to create hwmon-style
interfaces for ACPI 4.0 power meter devices. Users are more likely to
look for it there, and less likely to accidentally hide it by
unselecting its dependencies.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatar"Darrick J. Wong" <djwong@us.ibm.com>
Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
Cc: Len Brown <lenb@kernel.org>
parent 629c58ba

drivers/acpi/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -73,17 +73,6 @@ config ACPI_PROCFS_POWER 


	  Say N to delete power /proc/acpi/ directories that have moved to /sys/



config ACPI_POWER_METER

	tristate "ACPI 4.0 power meter"

	depends on HWMON

	help

	  This driver exposes ACPI 4.0 power meters as hardware monitoring

	  devices.  Say Y (or M) if you have a computer with ACPI 4.0 firmware

	  and a power meter.



	  To compile this driver as a module, choose M here:

	  the module will be called power-meter.



config ACPI_EC_DEBUGFS

	tristate "EC read/write access through /sys/kernel/debug/ec"

	default n

drivers/acpi/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o 
obj-$(CONFIG_ACPI_BATTERY)	+= battery.o

obj-$(CONFIG_ACPI_SBS)		+= sbshc.o

obj-$(CONFIG_ACPI_SBS)		+= sbs.o

obj-$(CONFIG_ACPI_POWER_METER)	+= power_meter.o

obj-$(CONFIG_ACPI_HED)		+= hed.o

obj-$(CONFIG_ACPI_EC_DEBUGFS)	+= ec_sys.o

drivers/hwmon/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -1351,6 +1351,16 @@ if ACPI 


comment "ACPI drivers"



config SENSORS_ACPI_POWER

	tristate "ACPI 4.0 power meter"

	help

	  This driver exposes ACPI 4.0 power meters as hardware monitoring

	  devices.  Say Y (or M) if you have a computer with ACPI 4.0 firmware

	  and a power meter.



	  To compile this driver as a module, choose M here:

	  the module will be called acpi_power_meter.



config SENSORS_ATK0110

	tristate "ASUS ATK0110"

	depends on X86 && EXPERIMENTAL

drivers/hwmon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ obj-$(CONFIG_HWMON) += hwmon.o 
obj-$(CONFIG_HWMON_VID)		+= hwmon-vid.o



# APCI drivers

obj-$(CONFIG_SENSORS_ACPI_POWER) += acpi_power_meter.o

obj-$(CONFIG_SENSORS_ATK0110)	+= asus_atk0110.o



# Native drivers

CRA Git | Maintained and supported by SUSTech CRA and CCSE