diff options
| author | Simon Horman <horms@verge.net.au> | 2008-10-06 17:40:11 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-10-06 17:40:11 -0400 |
| commit | a5e8546a8bff5d2047adc279df5753c44ba7b1a1 (patch) | |
| tree | d9ca91f74d8279adbb1d3e942cc7ab145780ee29 /drivers/net/wireless/libertas/defs.h | |
| parent | cb7f6a7b716e801097b564dec3ccb58d330aef56 (diff) | |
| parent | c7004482e8dcb7c3c72666395cfa98a216a4fb70 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/defs.h')
| -rw-r--r-- | drivers/net/wireless/libertas/defs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h index 58d11a35e61b..076a636e8f62 100644 --- a/drivers/net/wireless/libertas/defs.h +++ b/drivers/net/wireless/libertas/defs.h | |||
| @@ -189,7 +189,6 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in | |||
| 189 | #define MRVDRV_CMD_UPLD_RDY 0x0008 | 189 | #define MRVDRV_CMD_UPLD_RDY 0x0008 |
| 190 | #define MRVDRV_CARDEVENT 0x0010 | 190 | #define MRVDRV_CARDEVENT 0x0010 |
| 191 | 191 | ||
| 192 | |||
| 193 | /* Automatic TX control default levels */ | 192 | /* Automatic TX control default levels */ |
| 194 | #define POW_ADAPT_DEFAULT_P0 13 | 193 | #define POW_ADAPT_DEFAULT_P0 13 |
| 195 | #define POW_ADAPT_DEFAULT_P1 15 | 194 | #define POW_ADAPT_DEFAULT_P1 15 |