diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-05 23:56:54 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-05 23:56:54 +0200 |
| commit | c00aafcd4977769e8728292302ddbbb8b1082fab (patch) | |
| tree | 5766bcfbfd7b24816b54298b8ef34054f8cf0fae /drivers/net/wireless/iwlwifi/iwl-3945.h | |
| parent | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (diff) | |
| parent | 90bc1a658a53f8832ee799685703977a450e5af9 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h index fbb3a573463..2de6471d4be 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945.h @@ -112,7 +112,7 @@ enum iwl3945_antenna { #define IWL_TX_FIFO_NONE 7 /* Minimum number of queues. MAX_NUM is defined in hw specific files */ -#define IWL_MIN_NUM_QUEUES 4 +#define IWL39_MIN_NUM_QUEUES 4 #define IEEE80211_DATA_LEN 2304 #define IEEE80211_4ADDR_LEN 30 |