Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[~andy/linux] / drivers / macintosh / Makefile

diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile
index e3132efa17c059a1cd2ef59645468bb1ba2e1286..6652a6ebb6fa4105d3e72120546e562721619a8c 100644 (file)
--- 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/