6 files changed, 24 insertions, 24 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f2a2b8e647c5..3436e267586d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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>
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 97499d00615a..e382da3122b7 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -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
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index e3c2484f6c5f..ec9cb735c898 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -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
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index b49f9b143a7f..d2d15108ce4b 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -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
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index b26df2eac235..c97ac2a9dab7 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -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
diff --git a/drivers/hwmon/hdaps.c b/drivers/platform/x86/hdaps.c
index bfd42f18924b..067bf36d32f3 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/platform/x86/hdaps.c
@@ -1,5 +1,5 @@
 /*
- * drivers/hwmon/hdaps.c - driver for IBM's Hard Drive Active Protection System
+ * hdaps.c - driver for IBM's Hard Drive Active Protection System
  *
  * Copyright (C) 2005 Robert Love <rml@novell.com>
  * Copyright (C) 2005 Jesper Juhl <jesper.juhl@gmail.com>