Merge HEAD from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[linux-2.6] / drivers / macintosh / Makefile

diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile
index b3f88a4fcef77eaa912f31898eb9f903a4f89034..236291bd48a4117fe4e7eb12ae8075a9142a2ebd 100644 (file)
--- a/drivers/macintosh/Makefile
+++ b/drivers/macintosh/Makefile
@@ -4,9 +4,9 @@
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_PPC_PMAC)         += macio_asic.o
+obj-$(CONFIG_PPC_PMAC)         += macio_asic.o macio_sysfs.o
 
-obj-$(CONFIG_PMAC_PBOOK)       += mediabay.o
+obj-$(CONFIG_PMAC_MEDIABAY)    += mediabay.o
 obj-$(CONFIG_MAC_EMUMOUSEBTN)  += mac_hid.o
 obj-$(CONFIG_INPUT_ADBHID)     += adbhid.o
 obj-$(CONFIG_ANSLCD)           += ans-lcd.o