diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 04:52:20 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 04:52:20 -0400 |
| commit | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (patch) | |
| tree | 082cf7dd287f61635198011e61c3de1be130cc42 /drivers/macintosh/Makefile | |
| parent | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/macintosh/Makefile')
| -rw-r--r-- | drivers/macintosh/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile index c3a4705a8295..f5ae171dbfef 100644 --- a/drivers/macintosh/Makefile +++ b/drivers/macintosh/Makefile | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | obj-$(CONFIG_PPC_PMAC) += macio_asic.o | 7 | obj-$(CONFIG_PPC_PMAC) += macio_asic.o |
| 8 | 8 | ||
| 9 | obj-$(CONFIG_PMAC_PBOOK) += mediabay.o | 9 | obj-$(CONFIG_PMAC_MEDIABAY) += mediabay.o |
| 10 | obj-$(CONFIG_MAC_SERIAL) += macserial.o | ||
| 11 | obj-$(CONFIG_MAC_EMUMOUSEBTN) += mac_hid.o | 10 | obj-$(CONFIG_MAC_EMUMOUSEBTN) += mac_hid.o |
| 12 | obj-$(CONFIG_INPUT_ADBHID) += adbhid.o | 11 | obj-$(CONFIG_INPUT_ADBHID) += adbhid.o |
| 13 | obj-$(CONFIG_ANSLCD) += ans-lcd.o | 12 | obj-$(CONFIG_ANSLCD) += ans-lcd.o |