git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'r8169-upstream-20061204-00' of git://electric-eye.fr.zoreil.com/home/romie...
[sfrench/cifs-2.6.git]
/
drivers
/
macintosh
/
Makefile
diff --git
a/drivers/macintosh/Makefile
b/drivers/macintosh/Makefile
index b53d45f87b0bee7a74834cab9b2897f7d8eaa0f9..2dfc3f4eaf42b2055e8b4cddaf6ad6cff989180e 100644
(file)
--- a/
drivers/macintosh/Makefile
+++ b/
drivers/macintosh/Makefile
@@
-42,3
+42,4
@@
obj-$(CONFIG_WINDFARM_PM112) += windfarm_pm112.o windfarm_smu_sat.o \
windfarm_smu_sensors.o \
windfarm_max6690_sensor.o \
windfarm_lm75_sensor.o windfarm_pid.o
+obj-$(CONFIG_PMAC_RACKMETER) += rack-meter.o