Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile
index 1047b19c60a5..ab31c7124db1 100644
--- a/drivers/net/sfc/Makefile
+++ b/drivers/net/sfc/Makefile
@@ -1,7 +1,8 @@
-sfc-y                   += efx.o nic.o falcon.o siena.o tx.o rx.o \
-                           falcon_gmac.o falcon_xmac.o mcdi_mac.o \
+sfc-y                   += efx.o nic.o falcon.o siena.o tx.o rx.o filter.o \
+                           falcon_xmac.o mcdi_mac.o \
                            selftest.o ethtool.o qt202x_phy.o mdio_10g.o \
-                           tenxpress.o falcon_boards.o mcdi.o mcdi_phy.o
+                           tenxpress.o txc43128_phy.o falcon_boards.o \
+                           mcdi.o mcdi_phy.o
 sfc-$(CONFIG_SFC_MTD)   += mtd.o
 
 obj-$(CONFIG_SFC)       += sfc.o