Merge remote-tracking branches 'spi/topic/coldfire' and 'spi/topic/dw' into spi-next

[linux-beck.git] / drivers / net / Makefile

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index ca16dd689b36ba7836b71a8a24c9b81913b5ca67..900b0c5320bb908a2496c6bbe5c49026631b17a3 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -68,3 +68,5 @@ obj-$(CONFIG_USB_NET_DRIVERS) += usb/
 
 obj-$(CONFIG_HYPERV_NET) += hyperv/
 obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o
+
+obj-$(CONFIG_FUJITSU_ES) += fjes/