Merge branch 'topic/echoaudio' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / net / bonding / Makefile

diff --git a/drivers/net/bonding/Makefile b/drivers/net/bonding/Makefile
index 5cdae2bc055a9c27d679af0793d97bce459c0fd1..6f9c6faef24c4079741128e2e88f18c2cea3f979 100644 (file)
--- a/drivers/net/bonding/Makefile
+++ b/drivers/net/bonding/Makefile
@@ -6,3 +6,6 @@ obj-$(CONFIG_BONDING) += bonding.o
 
 bonding-objs := bond_main.o bond_3ad.o bond_alb.o bond_sysfs.o
 
+ipv6-$(subst m,y,$(CONFIG_IPV6)) += bond_ipv6.o
+bonding-objs += $(ipv6-y)
+