Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / firewire / Makefile

diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile
index 31edf30c558d2a52cf6714bcea46760fcc7e822b..a8f9bb6d9fdfb93b825089a0a163b02004d884ae 100644 (file)
--- a/drivers/firewire/Makefile
+++ b/drivers/firewire/Makefile
@@ -6,9 +6,9 @@ firewire-core-y += core-card.o core-cdev.o core-device.o \
                    core-iso.o core-topology.o core-transaction.o
 firewire-ohci-y += ohci.o
 firewire-sbp2-y += sbp2.o
-firewire-ipv4-y += fw-ipv4.o
+firewire-net-y  += net.o
 
-obj-$(CONFIG_FIREWIRE) += firewire-core.o
+obj-$(CONFIG_FIREWIRE)      += firewire-core.o
 obj-$(CONFIG_FIREWIRE_OHCI) += firewire-ohci.o
 obj-$(CONFIG_FIREWIRE_SBP2) += firewire-sbp2.o
-obj-$(CONFIG_FIREWIRE_IPV4) += firewire-ipv4.o
+obj-$(CONFIG_FIREWIRE_NET)  += firewire-net.o