i40e: Fix dependencies in the i40e driver on configfs
authorGreg Rose <gregory.v.rose@intel.com>
Tue, 3 Mar 2015 21:21:54 +0000 (13:21 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Mar 2015 21:52:41 +0000 (16:52 -0500)
Module dependencies are broken in the case where CONFIG_I40E=y and
CONFIG_CONFIGFS_FS=m.  This fixes the broken dependency.

Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/intel/Kconfig
drivers/net/ethernet/intel/i40e/i40e.h
drivers/net/ethernet/intel/i40e/i40e_configfs.c
drivers/net/ethernet/intel/i40e/i40e_main.c

Simple merge