Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd9fc3a7 authored by Jean Delvare's avatar Jean Delvare Committed by Matthew Garrett
Browse files

Move hdaps driver to platform/x86 



The hdaps driver isn't a hardware monitoring driver, so it shouldn't
live under driver/hwmon. drivers/platform/x86 seems much more
appropriate, as the driver is only useful on x86 laptops.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Frank Seidel <frank@f-seidel.de>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 75b2d09a

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2604,10 +2604,10 @@ F: drivers/net/greth* 


HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER

M:	Frank Seidel <frank@f-seidel.de>

L:	lm-sensors@lm-sensors.org

L:	platform-driver-x86@vger.kernel.org

W:	http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/

S:	Maintained

F:	drivers/hwmon/hdaps.c

F:	drivers/platform/x86/hdaps.c



HWPOISON MEMORY FAILURE HANDLING

M:	Andi Kleen <andi@firstfloor.org>

drivers/hwmon/Kconfig

+0 −20
Original line number Diff line number Diff line
@@ -1088,26 +1088,6 @@ config SENSORS_ULTRA45 
	  This driver provides support for the Ultra45 workstation environmental

	  sensors.



config SENSORS_HDAPS

	tristate "IBM Hard Drive Active Protection System (hdaps)"

	depends on INPUT && X86

	select INPUT_POLLDEV

	default n

	help

	  This driver provides support for the IBM Hard Drive Active Protection

	  System (hdaps), which provides an accelerometer and other misc. data.

	  ThinkPads starting with the R50, T41, and X40 are supported.  The

	  accelerometer data is readable via sysfs.



	  This driver also provides an absolute input class device, allowing

	  the laptop to act as a pinball machine-esque joystick.



	  If your ThinkPad is not recognized by the driver, please update to latest

	  BIOS. This is especially the case for some R52 ThinkPads.



	  Say Y here if you have an applicable laptop and want to experience

	  the awesome power of hdaps.



config SENSORS_LIS3_SPI

	tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"

	depends on !ACPI && SPI_MASTER && INPUT

drivers/hwmon/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ obj-$(CONFIG_SENSORS_G760A) += g760a.o 
obj-$(CONFIG_SENSORS_GL518SM)	+= gl518sm.o

obj-$(CONFIG_SENSORS_GL520SM)	+= gl520sm.o

obj-$(CONFIG_SENSORS_ULTRA45)	+= ultra45_env.o

obj-$(CONFIG_SENSORS_HDAPS)	+= hdaps.o

obj-$(CONFIG_SENSORS_I5K_AMB)	+= i5k_amb.o

obj-$(CONFIG_SENSORS_IBMAEM)	+= ibmaem.o

obj-$(CONFIG_SENSORS_IBMPEX)	+= ibmpex.o

drivers/platform/x86/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -368,6 +368,26 @@ config THINKPAD_ACPI_HOTKEY_POLL 
	  If you are not sure, say Y here.  The driver enables polling only if

	  it is strictly necessary to do so.



config SENSORS_HDAPS

	tristate "Thinkpad Hard Drive Active Protection System (hdaps)"

	depends on INPUT && X86

	select INPUT_POLLDEV

	default n

	help

	  This driver provides support for the IBM Hard Drive Active Protection

	  System (hdaps), which provides an accelerometer and other misc. data.

	  ThinkPads starting with the R50, T41, and X40 are supported.  The

	  accelerometer data is readable via sysfs.



	  This driver also provides an absolute input class device, allowing

	  the laptop to act as a pinball machine-esque joystick.



	  If your ThinkPad is not recognized by the driver, please update to latest

	  BIOS. This is especially the case for some R52 ThinkPads.



	  Say Y here if you have an applicable laptop and want to experience

	  the awesome power of hdaps.



config INTEL_MENLOW

	tristate "Thermal Management driver for Intel menlow platform"

	depends on ACPI_THERMAL

drivers/platform/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o 
obj-$(CONFIG_SONY_LAPTOP)	+= sony-laptop.o

obj-$(CONFIG_IDEAPAD_LAPTOP)	+= ideapad-laptop.o

obj-$(CONFIG_THINKPAD_ACPI)	+= thinkpad_acpi.o

obj-$(CONFIG_SENSORS_HDAPS)	+= hdaps.o

obj-$(CONFIG_FUJITSU_LAPTOP)	+= fujitsu-laptop.o

obj-$(CONFIG_PANASONIC_LAPTOP)	+= panasonic-laptop.o

obj-$(CONFIG_INTEL_MENLOW)	+= intel_menlow.o