Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux

[mirror_ubuntu-artful-kernel.git] / drivers / net / ethernet / intel / Makefile

diff --git a/drivers/net/ethernet/intel/Makefile b/drivers/net/ethernet/intel/Makefile
index cdbbca8a3755b723bbb484886a94c23d62c5950a..5ea764d85ec341570350c35d39f42ee2139931ed 100644 (file)
--- a/drivers/net/ethernet/intel/Makefile
+++ b/drivers/net/ethernet/intel/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_IXGBEVF) += ixgbevf/
 obj-$(CONFIG_I40E) += i40e/
 obj-$(CONFIG_IXGB) += ixgb/
 obj-$(CONFIG_I40EVF) += i40evf/
+obj-$(CONFIG_FM10K) += fm10k/