Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / firewire / Makefile

diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile
index b955c99985495de59e5b203f7172a753e1c8b85c..a7c31e9039c14c0912554ed981c1fa390ce7606d 100644 (file)
--- a/drivers/firewire/Makefile
+++ b/drivers/firewire/Makefile
@@ -2,9 +2,11 @@
 # Makefile for the Linux IEEE 1394 implementation
 #
 
-fw-core-objs := fw-card.o fw-topology.o fw-transaction.o fw-iso.o \
-       fw-device.o fw-device-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_FW) += fw-core.o
-obj-$(CONFIG_FW_OHCI) += fw-ohci.o
-obj-$(CONFIG_FW_SBP2) += fw-sbp2.o
\ No newline at end of file
+obj-$(CONFIG_FIREWIRE) += firewire-core.o
+obj-$(CONFIG_FIREWIRE_OHCI) += firewire-ohci.o
+obj-$(CONFIG_FIREWIRE_SBP2) += firewire-sbp2.o