diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 13:45:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 13:45:38 -0700 |
| commit | 486b4ce13221aa6cd0cbc9fff6993f444d8a52b5 (patch) | |
| tree | ca903d6f4213556a82f2268eeeac1fd01d80cd4a /drivers/firewire/Makefile | |
| parent | 358a9afc35d550db4f67b1c8336f5326244ceeda (diff) | |
| parent | 350958f984268dcf0f087aac78c5b9fe2846aeff (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: fix return code
firewire: prefix modules with firewire- instead of fw-
firewire: Add missing byteswapping for receive DMA programs.
ieee1394: raw1394: Fix async send
ieee1394: eth1394: bring back a parent device
ieee1394: eth1394: handle tlabel exhaustion
ieee1394: eth1394: remove bogus netif_wake_queue
ieee1394: sbp2: include workqueue.h
Diffstat (limited to 'drivers/firewire/Makefile')
| -rw-r--r-- | drivers/firewire/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile index fc7d59d4bce..a7c31e9039c 100644 --- a/drivers/firewire/Makefile +++ b/drivers/firewire/Makefile @@ -2,9 +2,11 @@ # Makefile for the Linux IEEE 1394 implementation # -fw-core-y += fw-card.o fw-topology.o fw-transaction.o fw-iso.o \ - fw-device.o fw-cdev.o +firewire-core-y += fw-card.o fw-topology.o fw-transaction.o fw-iso.o \ + fw-device.o fw-cdev.o +firewire-ohci-y += fw-ohci.o +firewire-sbp2-y += fw-sbp2.o -obj-$(CONFIG_FIREWIRE) += fw-core.o -obj-$(CONFIG_FIREWIRE_OHCI) += fw-ohci.o -obj-$(CONFIG_FIREWIRE_SBP2) += fw-sbp2.o +obj-$(CONFIG_FIREWIRE) += firewire-core.o +obj-$(CONFIG_FIREWIRE_OHCI) += firewire-ohci.o +obj-$(CONFIG_FIREWIRE_SBP2) += firewire-sbp2.o |