diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-04-03 16:44:37 -0700 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-23 14:29:02 -0700 |
| commit | 825751027d18d63fa25a8236c983822aef4be220 (patch) | |
| tree | cb61ffc596b52ab0871de1a2fe288b6bf294b0a1 /drivers/net | |
| parent | 24e4986283be8dffce54bd1ebe79d82cad913862 (diff) | |
| download | linux-825751027d18d63fa25a8236c983822aef4be220.tar.gz | |
iwlwifi: move driver defines to iwl-drv.h
These defines will have to be shared between modules, but they seem better placed in iwl-drv.h than iwl-shared.h. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.h | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-shared.h | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index d479dace9fc6..0aba3780160f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -51,6 +51,7 @@ #include "iwl-agn.h" #include "iwl-trans.h" #include "iwl-op-mode.h" +#include "iwl-drv.h" /****************************************************************************** * diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.h b/drivers/net/wireless/iwlwifi/iwl-drv.h index 9ffcd1eacbd4..2cbf137b25bf 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.h +++ b/drivers/net/wireless/iwlwifi/iwl-drv.h @@ -63,6 +63,13 @@ #ifndef __iwl_drv_h__ #define __iwl_drv_h__ +/* for all modules */ +#define DRV_NAME "iwlwifi" +#define IWLWIFI_VERSION "in-tree:" +#define DRV_COPYRIGHT "Copyright(c) 2003-2012 Intel Corporation" +#define DRV_AUTHOR "<ilw@linux.intel.com>" + + /** * DOC: Driver system flows - drv component * diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index 079964bc07ed..3f21dd2bd8b0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -68,11 +68,6 @@ #include <linux/gfp.h> #include <net/mac80211.h> -#define DRV_NAME "iwlwifi" -#define IWLWIFI_VERSION "in-tree:" -#define DRV_COPYRIGHT "Copyright(c) 2003-2012 Intel Corporation" -#define DRV_AUTHOR "<ilw@linux.intel.com>" - extern struct iwl_mod_params iwlagn_mod_params; #define IWL_DISABLE_HT_ALL BIT(0) diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index 36616e3f9640..b6522ca2d879 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c @@ -68,6 +68,7 @@ #include <linux/bitops.h> #include <linux/gfp.h> +#include "iwl-drv.h" #include "iwl-trans.h" #include "iwl-shared.h" #include "iwl-trans-pcie-int.h" |