diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-08-22 14:15:47 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-22 14:15:47 -0400 |
| commit | 6de3f7e911d27d6737c79b3f6b5069044ea408ec (patch) | |
| tree | 186dcf1897be76a4155f5a22a7f242c29f328c5a /drivers/net/wireless/iwlwifi/dvm/agn.h | |
| parent | 33dd7699cefd175c3a5d3d6077db9c8d8322c9a7 (diff) | |
| parent | 40503f7b48260a91ab65a4f8b00a2c6f004fa807 (diff) | |
| download | talos-op-linux-6de3f7e911d27d6737c79b3f6b5069044ea408ec.tar.gz talos-op-linux-6de3f7e911d27d6737c79b3f6b5069044ea408ec.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/agn.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/agn.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h index f0b8c1f7591c..75e12f29d9eb 100644 --- a/drivers/net/wireless/iwlwifi/dvm/agn.h +++ b/drivers/net/wireless/iwlwifi/dvm/agn.h @@ -487,16 +487,13 @@ static inline void iwl_dvm_set_pmi(struct iwl_priv *priv, bool state) } #ifdef CONFIG_IWLWIFI_DEBUGFS -int iwl_dbgfs_register(struct iwl_priv *priv, const char *name); -void iwl_dbgfs_unregister(struct iwl_priv *priv); +int iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir); #else -static inline int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) +static inline int iwl_dbgfs_register(struct iwl_priv *priv, + struct dentry *dbgfs_dir) { return 0; } -static inline void iwl_dbgfs_unregister(struct iwl_priv *priv) -{ -} #endif /* CONFIG_IWLWIFI_DEBUGFS */ #ifdef CONFIG_IWLWIFI_DEBUG |
