diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-17 16:20:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 16:20:14 -0800 |
| commit | 8c2fcadc933f713d51f46ec4dcd9b12830e0df84 (patch) | |
| tree | e0797b2db664d702f9d02dd0f45efddb2f0d7fe9 /drivers/net/wireless/b43/b43.h | |
| parent | 232486e1e9f34889424b68ee6270440b554479a2 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/wireless/b43/b43.h')
| -rw-r--r-- | drivers/net/wireless/b43/b43.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index fe3bf949199..c484cc25389 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h @@ -115,6 +115,7 @@ #define B43_MMIO_TSF_2 0x636 /* core rev < 3 only */ #define B43_MMIO_TSF_3 0x638 /* core rev < 3 only */ #define B43_MMIO_RNG 0x65A +#define B43_MMIO_IFSSLOT 0x684 /* Interframe slot time */ #define B43_MMIO_IFSCTL 0x688 /* Interframe space control */ #define B43_MMIO_IFSCTL_USE_EDCF 0x0004 #define B43_MMIO_POWERUP_DELAY 0x6A8 |