aboutsummaryrefslogtreecommitdiff
path: root/drivers/macintosh/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-27 22:03:52 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 22:03:52 -0400
commit716b43303df605510399d6da0d0dd4e2ea376e7c (patch)
tree57412aaf516b7a10b4b81064aeda318514fec168 /drivers/macintosh/Makefile
parent5696c1944a33b4434a9a1ebb6383b906afd43a10 (diff)
parentc7b645f934e52a54af58142d91fb51f881f8ce26 (diff)
Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)
Diffstat (limited to 'drivers/macintosh/Makefile')
-rw-r--r--drivers/macintosh/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile
index c3a4705a829..f5ae171dbfe 100644
--- a/drivers/macintosh/Makefile
+++ b/drivers/macintosh/Makefile
@@ -6,8 +6,7 @@
obj-$(CONFIG_PPC_PMAC) += macio_asic.o
-obj-$(CONFIG_PMAC_PBOOK) += mediabay.o
-obj-$(CONFIG_MAC_SERIAL) += macserial.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