diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-14 17:45:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-14 17:45:59 -0800 |
| commit | f6f223039c0d0683bdea1eabd35b309e10311a60 (patch) | |
| tree | 890e07acf8c18ddc2994ebc0a0bdcdda38b0dcc6 /drivers/net/wireless/b43/b43.h | |
| parent | b3b3f04fb587ecb61b5baa6c1c5f0e666fd12d73 (diff) | |
| parent | 42c4568a4ace0adc27a9d6f02936e2047ba6fc7e (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-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 54d6085a887..6a6ab0f630e 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 |