Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6] / drivers / macintosh / Makefile

diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile
index 236291bd48a4117fe4e7eb12ae8075a9142a2ebd..f4657aa81fb0474d92f1c525af90015db1d5a6c3 100644 (file)
--- a/drivers/macintosh/Makefile
+++ b/drivers/macintosh/Makefile
@@ -26,3 +26,12 @@ obj-$(CONFIG_ADB_MACIO)              += macio-adb.o
 obj-$(CONFIG_THERM_PM72)       += therm_pm72.o
 obj-$(CONFIG_THERM_WINDTUNNEL) += therm_windtunnel.o
 obj-$(CONFIG_THERM_ADT746X)    += therm_adt746x.o
+obj-$(CONFIG_WINDFARM)         += windfarm_core.o
+obj-$(CONFIG_WINDFARM_PM81)     += windfarm_smu_controls.o \
+                                  windfarm_smu_sensors.o \
+                                  windfarm_lm75_sensor.o windfarm_pid.o \
+                                  windfarm_cpufreq_clamp.o windfarm_pm81.o
+obj-$(CONFIG_WINDFARM_PM91)     += windfarm_smu_controls.o \
+                                  windfarm_smu_sensors.o \
+                                  windfarm_lm75_sensor.o windfarm_pid.o \
+                                  windfarm_cpufreq_clamp.o windfarm_pm91.o