5 files changed, 21 insertions, 23 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index c48101cf58f..3f8c895417d 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1302,25 +1302,6 @@ config SENSORS_ATK0110
           This driver can also be built as a module. If so, the module
           will be called asus_atk0110.
 
-config HP_ACCEL
-        tristate "HP laptop accelerometer"
-        depends on INPUT
-        select SENSORS_LIS3LV02D
-        select NEW_LEDS
-        select LEDS_CLASS
-        default n
-        help
-          This driver provides support for the "Mobile Data Protection System 3D"
-          or "3D DriveGuard" feature of HP laptops. On such systems the driver
-          should load automatically (via ACPI alias).
-
-          Support for a led indicating disk protection will be provided as
-          hp::hddprotect. For more information on the feature, refer to
-          Documentation/hwmon/lis3lv02d.
-
-          To compile this driver as a module, choose M here: the module will
-          be called hp_accel.
-
 endif # ACPI
 
 endif # HWMON
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 94bf2748297..55ba906def7 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o
 
 # APCI drivers
 obj-$(CONFIG_SENSORS_ATK0110)   += asus_atk0110.o
-obj-$(CONFIG_HP_ACCEL)          += hp_accel.o
 
 # Native drivers
 # asb100, then w83781d go first, as they can override other drivers' addresses.
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index a59af5b24f0..222dfb737b1 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -138,6 +138,24 @@ config TC1100_WMI
           This is a driver for the WMI extensions (wireless and bluetooth power
           control) of the HP Compaq TC1100 tablet.
 
+config HP_ACCEL
+        tristate "HP laptop accelerometer"
+        depends on INPUT && ACPI
+        select SENSORS_LIS3LV02D
+        select NEW_LEDS
+        select LEDS_CLASS
+        help
+          This driver provides support for the "Mobile Data Protection System 3D"
+          or "3D DriveGuard" feature of HP laptops. On such systems the driver
+          should load automatically (via ACPI alias).
+
+          Support for a led indicating disk protection will be provided as
+          hp::hddprotect. For more information on the feature, refer to
+          Documentation/hwmon/lis3lv02d.
+
+          To compile this driver as a module, choose M here: the module will
+          be called hp_accel.
+
 config HP_WMI
         tristate "HP WMI extras"
         depends on ACPI_WMI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 4ec4ff8f918..299aefb3e74 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_DELL_LAPTOP)	+= dell-laptop.o
 obj-$(CONFIG_DELL_WMI)          += dell-wmi.o
 obj-$(CONFIG_ACER_WMI)          += acer-wmi.o
 obj-$(CONFIG_ACERHDF)           += acerhdf.o
+obj-$(CONFIG_HP_ACCEL)          += hp_accel.o
 obj-$(CONFIG_HP_WMI)            += hp-wmi.o
 obj-$(CONFIG_TC1100_WMI)        += tc1100-wmi.o
 obj-$(CONFIG_SONY_LAPTOP)       += sony-laptop.o
diff --git a/drivers/hwmon/hp_accel.c b/drivers/platform/x86/hp_accel.c
index 3d21fa2b97c..23f09c1b234 100644
--- a/drivers/hwmon/hp_accel.c
+++ b/drivers/platform/x86/hp_accel.c
@@ -35,9 +35,9 @@
 #include <linux/freezer.h>
 #include <linux/uaccess.h>
 #include <linux/leds.h>
+#include <linux/atomic.h>
 #include <acpi/acpi_drivers.h>
-#include <asm/atomic.h>
-#include "lis3lv02d.h"
+#include "../../hwmon/lis3lv02d.h"
 
 #define DRIVER_NAME     "lis3lv02d"
 #define ACPI_MDPS_CLASS "accelerometer"
@@ -402,4 +402,3 @@ MODULE_LICENSE("GPL");
 
 module_init(lis3lv02d_init_module);
 module_exit(lis3lv02d_exit_module);
-