diff options
| author |   Greg Rose <gregory.v.rose@intel.com> | 2015-03-03 13:21:54 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-03 16:52:41 -0500 |
| commit | e8ab38cfcb6eac7f4e7e3b8e787a9d4bea54c2cb (patch) | |
| tree | 03e85b7d6f739e7c18b94bf663555388e9a996b4 /drivers/net/ethernet/intel/i40e/i40e_main.c | |
| parent | ax25: Stop using magic neighbour cache operations. (diff) | |
| download | linux-dev-e8ab38cfcb6eac7f4e7e3b8e787a9d4bea54c2cb.tar.xz linux-dev-e8ab38cfcb6eac7f4e7e3b8e787a9d4bea54c2cb.zip | |
i40e: Fix dependencies in the i40e driver on configfs
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 2757926f7805..aadc60432980 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -10108,9 +10108,9 @@ static int __init i40e_init_module(void) i40e_driver_string, i40e_driver_version_str); pr_info("%s: %s\n", i40e_driver_name, i40e_copyright); -#if IS_ENABLED(CONFIG_CONFIGFS_FS) +#if IS_ENABLED(CONFIG_I40E_CONFIGFS_FS) i40e_configfs_init(); -#endif /* CONFIG_CONFIGFS_FS */ +#endif /* CONFIG_I40E_CONFIGFS_FS */ i40e_dbg_init(); return pci_register_driver(&i40e_driver); } @@ -10126,8 +10126,8 @@ static void __exit i40e_exit_module(void) { pci_unregister_driver(&i40e_driver); i40e_dbg_exit(); -#if IS_ENABLED(CONFIG_CONFIGFS_FS) +#if IS_ENABLED(CONFIG_I40E_CONFIGFS_FS) i40e_configfs_exit(); -#endif /* CONFIG_CONFIGFS_FS */ +#endif /* CONFIG_I40E_CONFIGFS_FS */ } module_exit(i40e_exit_module); |