diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-16 22:37:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-16 22:37:51 -0400 |
| commit | 8c95b4773dd8d0415269ffad7301ef96d75be8ee (patch) | |
| tree | 996401ce91c2a652fcff690e2c8bf88f2014d307 /drivers/net/wireless/libertas/defs.h | |
| parent | bcff122d478b774f4fd5262f35eedebe2f2fb274 (diff) | |
| parent | 30b89b0f5e1313c8a5a039abeaa89248b6338d81 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.26
Diffstat (limited to 'drivers/net/wireless/libertas/defs.h')
| -rw-r--r-- | drivers/net/wireless/libertas/defs.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h index 84e8de5e21da..d39520111062 100644 --- a/drivers/net/wireless/libertas/defs.h +++ b/drivers/net/wireless/libertas/defs.h | |||
| @@ -177,8 +177,6 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in | |||
| 177 | #define MRVDRV_CMD_UPLD_RDY 0x0008 | 177 | #define MRVDRV_CMD_UPLD_RDY 0x0008 |
| 178 | #define MRVDRV_CARDEVENT 0x0010 | 178 | #define MRVDRV_CARDEVENT 0x0010 |
| 179 | 179 | ||
| 180 | #define SBI_EVENT_CAUSE_SHIFT 3 | ||
| 181 | |||
| 182 | /** TxPD status */ | 180 | /** TxPD status */ |
| 183 | 181 | ||
| 184 | /* Station firmware use TxPD status field to report final Tx transmit | 182 | /* Station firmware use TxPD status field to report final Tx transmit |