11 files changed, 29 insertions, 28 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 19f262c2732..49e88f3872c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -432,7 +432,7 @@ AMS (Apple Motion Sensor) DRIVER
 M:      Stelian Pop <stelian@popies.net>
 M:      Michael Hanselmann <linux-kernel@hansmi.ch>
 S:      Supported
-F:      drivers/hwmon/ams/
+F:      drivers/macintosh/ams/
 
 AMSO1100 RNIC DRIVER
 M:      Tom Tucker <tom@opengridcomputing.com>
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index a06ac97229d..ad54f6432e2 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -249,32 +249,6 @@ config SENSORS_K10TEMP
           This driver can also be built as a module.  If so, the module
           will be called k10temp.
 
-config SENSORS_AMS
-        tristate "Apple Motion Sensor driver"
-        depends on PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL
-        select INPUT_POLLDEV
-        help
-          Support for the motion sensor included in PowerBooks. Includes
-          implementations for PMU and I2C.
-
-          This driver can also be built as a module. If so, the module
-          will be called ams.
-
-config SENSORS_AMS_PMU
-        bool "PMU variant"
-        depends on SENSORS_AMS && ADB_PMU
-        default y
-        help
-          PMU variant of motion sensor, found in late 2005 PowerBooks.
-
-config SENSORS_AMS_I2C
-        bool "I2C variant"
-        depends on SENSORS_AMS && I2C
-        default y
-        help
-          I2C variant of motion sensor, found in early 2005 PowerBooks and
-          iBooks.
-
 config SENSORS_ASB100
         tristate "Asus ASB100 Bach"
         depends on X86 && I2C && EXPERIMENTAL
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 641b8b349a3..2479b3da272 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -36,7 +36,6 @@ obj-$(CONFIG_SENSORS_ADT7462)	+= adt7462.o
 obj-$(CONFIG_SENSORS_ADT7470)   += adt7470.o
 obj-$(CONFIG_SENSORS_ADT7475)   += adt7475.o
 obj-$(CONFIG_SENSORS_APPLESMC)  += applesmc.o
-obj-$(CONFIG_SENSORS_AMS)       += ams/
 obj-$(CONFIG_SENSORS_ASC7621)   += asc7621.o
 obj-$(CONFIG_SENSORS_ATXP1)     += atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)  += coretemp.o
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index fd85bde283a..3d7355ff730 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -256,4 +256,30 @@ config PMAC_RACKMETER
           This driver provides some support to control the front panel
           blue LEDs "vu-meter" of the XServer macs.
 
+config SENSORS_AMS
+        tristate "Apple Motion Sensor driver"
+        depends on PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL
+        select INPUT_POLLDEV
+        help
+          Support for the motion sensor included in PowerBooks. Includes
+          implementations for PMU and I2C.
+
+          This driver can also be built as a module. If so, the module
+          will be called ams.
+
+config SENSORS_AMS_PMU
+        bool "PMU variant"
+        depends on SENSORS_AMS && ADB_PMU
+        default y
+        help
+          PMU variant of motion sensor, found in late 2005 PowerBooks.
+
+config SENSORS_AMS_I2C
+        bool "I2C variant"
+        depends on SENSORS_AMS && I2C
+        default y
+        help
+          I2C variant of motion sensor, found in early 2005 PowerBooks and
+          iBooks.
+
 endif # MACINTOSH_DRIVERS
diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile
index e3132efa17c..6652a6ebb6f 100644
--- a/drivers/macintosh/Makefile
+++ b/drivers/macintosh/Makefile
@@ -48,3 +48,5 @@ obj-$(CONFIG_WINDFARM_PM121)	+= windfarm_pm121.o windfarm_smu_sat.o \
                                    windfarm_max6690_sensor.o \
                                    windfarm_lm75_sensor.o windfarm_pid.o
 obj-$(CONFIG_PMAC_RACKMETER)    += rack-meter.o
+
+obj-$(CONFIG_SENSORS_AMS)       += ams/
diff --git a/drivers/hwmon/ams/Makefile b/drivers/macintosh/ams/Makefile
index 41c95b2089d..41c95b2089d 100644
--- a/drivers/hwmon/ams/Makefile
+++ b/drivers/macintosh/ams/Makefile
diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/macintosh/ams/ams-core.c
index 2ad62c339cd..2ad62c339cd 100644
--- a/drivers/hwmon/ams/ams-core.c
+++ b/drivers/macintosh/ams/ams-core.c
diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/macintosh/ams/ams-i2c.c
index abeecd27b48..abeecd27b48 100644
--- a/drivers/hwmon/ams/ams-i2c.c
+++ b/drivers/macintosh/ams/ams-i2c.c
diff --git a/drivers/hwmon/ams/ams-input.c b/drivers/macintosh/ams/ams-input.c
index 8a712392cd3..8a712392cd3 100644
--- a/drivers/hwmon/ams/ams-input.c
+++ b/drivers/macintosh/ams/ams-input.c
diff --git a/drivers/hwmon/ams/ams-pmu.c b/drivers/macintosh/ams/ams-pmu.c
index 4f61b3ee1b0..4f61b3ee1b0 100644
--- a/drivers/hwmon/ams/ams-pmu.c
+++ b/drivers/macintosh/ams/ams-pmu.c
diff --git a/drivers/hwmon/ams/ams.h b/drivers/macintosh/ams/ams.h
index 90f094d4545..90f094d4545 100644
--- a/drivers/hwmon/ams/ams.h
+++ b/drivers/macintosh/ams/ams.h