diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:13:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:13:00 -0700 |
commit | f063a0c0c995d010960efcc1b2ed14b99674f25c (patch) | |
tree | 106e30acd1a58b3cf9f3c15abe1de83f1919e03b /drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | |
parent | 3c3762957818dc902222733a8184f23102e24472 (diff) | |
parent | 5af634789c93b97cfb314a102436716be8fbc577 (diff) | |
download | op-kernel-dev-f063a0c0c995d010960efcc1b2ed14b99674f25c.zip op-kernel-dev-f063a0c0c995d010960efcc1b2ed14b99674f25c.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits)
Staging: brcm80211: fix usage of roundup in structures
Staging: bcm: fix up network device reference counting
Staging: keucr: fix up US_ macro change
staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
staging: brcm80211: Remove unnecessary header files.
staging: brcm80211: Remove unnecessary includes from bcmutils.c
staging: brcm80211: Removed unnecessary pktsetprio() function.
Staging: brcm80211: remove typedefs.h
Staging: brcm80211: remove uintptr typedef usage
Staging: hv: remove struct vmbus_channel_interface
Staging: hv: remove Open from struct vmbus_channel_interface
Staging: hv: storvsc: call vmbus_open directly
Staging: hv: netvsc: call vmbus_open directly
Staging: hv: channel: export vmbus_open to modules
Staging: hv: remove Close from struct vmbus_channel_interface
Staging: hv: netvsc: call vmbus_close directly
Staging: hv: storvsc: call vmbus_close directly
Staging: hv: channel: export vmbus_close to modules
Staging: hv: remove SendPacket from struct vmbus_channel_interface
Staging: hv: storvsc: call vmbus_sendpacket directly
...
Fix up conflicts in
drivers/staging/cx25821/cx25821-audio-upstream.c
drivers/staging/cx25821/cx25821-audio.h
due to warring whitespace cleanups (neither of which were all that great)
Diffstat (limited to 'drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h')
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h b/drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h new file mode 100644 index 0000000..31c8363 --- /dev/null +++ b/drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h @@ -0,0 +1,31 @@ +#ifndef __RTL8712_RATECTRL_REGDEF_H__ +#define __RTL8712_RATECTRL_REGDEF_H__ + +#define INIMCS_SEL (RTL8712_RATECTRL_ + 0x00) +#define INIRTSMCS_SEL (RTL8712_RATECTRL_ + 0x20) +#define RRSR (RTL8712_RATECTRL_ + 0x21) +#define ARFR0 (RTL8712_RATECTRL_ + 0x24) +#define ARFR1 (RTL8712_RATECTRL_ + 0x28) +#define ARFR2 (RTL8712_RATECTRL_ + 0x2C) +#define ARFR3 (RTL8712_RATECTRL_ + 0x30) +#define ARFR4 (RTL8712_RATECTRL_ + 0x34) +#define ARFR5 (RTL8712_RATECTRL_ + 0x38) +#define ARFR6 (RTL8712_RATECTRL_ + 0x3C) +#define ARFR7 (RTL8712_RATECTRL_ + 0x40) +#define AGGLEN_LMT_H (RTL8712_RATECTRL_ + 0x47) +#define AGGLEN_LMT_L (RTL8712_RATECTRL_ + 0x48) +#define DARFRC (RTL8712_RATECTRL_ + 0x50) +#define RARFRC (RTL8712_RATECTRL_ + 0x58) +#define MCS_TXAGC0 (RTL8712_RATECTRL_ + 0x60) +#define MCS_TXAGC1 (RTL8712_RATECTRL_ + 0x61) +#define MCS_TXAGC2 (RTL8712_RATECTRL_ + 0x62) +#define MCS_TXAGC3 (RTL8712_RATECTRL_ + 0x63) +#define MCS_TXAGC4 (RTL8712_RATECTRL_ + 0x64) +#define MCS_TXAGC5 (RTL8712_RATECTRL_ + 0x65) +#define MCS_TXAGC6 (RTL8712_RATECTRL_ + 0x66) +#define MCS_TXAGC7 (RTL8712_RATECTRL_ + 0x67) +#define CCK_TXAGC (RTL8712_RATECTRL_ + 0x68) + + +#endif /*__RTL8712_RATECTRL_REGDEF_H__*/ + |