Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82575102 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 24e49862

drivers/net/wireless/iwlwifi/iwl-agn.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "iwl-agn.h"

#include "iwl-agn.h"

#include "iwl-trans.h"

#include "iwl-trans.h"

#include "iwl-op-mode.h"

#include "iwl-op-mode.h"

#include "iwl-drv.h"





/******************************************************************************

/******************************************************************************

 *

 *

drivers/net/wireless/iwlwifi/iwl-drv.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,13 @@ 
#ifndef __iwl_drv_h__

#ifndef __iwl_drv_h__

#define __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

 * DOC: Driver system flows - drv component

 *

 *

drivers/net/wireless/iwlwifi/iwl-shared.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -68,11 +68,6 @@ 
#include <linux/gfp.h>

#include <linux/gfp.h>

#include <net/mac80211.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;

extern struct iwl_mod_params iwlagn_mod_params;





#define IWL_DISABLE_HT_ALL	BIT(0)

#define IWL_DISABLE_HT_ALL	BIT(0)

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ 
#include <linux/bitops.h>

#include <linux/bitops.h>

#include <linux/gfp.h>

#include <linux/gfp.h>





#include "iwl-drv.h"

#include "iwl-trans.h"

#include "iwl-trans.h"

#include "iwl-shared.h"

#include "iwl-shared.h"

#include "iwl-trans-pcie-int.h"

#include "iwl-trans-pcie-int.h"