diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8712/rtl8712_edcasetting_regdef.h | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712/rtl8712_edcasetting_regdef.h')
| -rw-r--r-- | drivers/staging/rtl8712/rtl8712_edcasetting_regdef.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_edcasetting_regdef.h b/drivers/staging/rtl8712/rtl8712_edcasetting_regdef.h new file mode 100644 index 0000000..de3d3e2 --- /dev/null +++ b/drivers/staging/rtl8712/rtl8712_edcasetting_regdef.h @@ -0,0 +1,18 @@ +#ifndef __RTL8712_EDCASETTING_REGDEF_H__ +#define __RTL8712_EDCASETTING_REGDEF_H__ + +#define EDCA_VO_PARAM (RTL8712_EDCASETTING_ + 0x00) +#define EDCA_VI_PARAM (RTL8712_EDCASETTING_ + 0x04) +#define EDCA_BE_PARAM (RTL8712_EDCASETTING_ + 0x08) +#define EDCA_BK_PARAM (RTL8712_EDCASETTING_ + 0x0C) +#define BCNTCFG (RTL8712_EDCASETTING_ + 0x10) +#define CWRR (RTL8712_EDCASETTING_ + 0x12) +#define ACMAVG (RTL8712_EDCASETTING_ + 0x16) +#define ACMHWCTRL (RTL8712_EDCASETTING_ + 0x17) +#define VO_ADMTIME (RTL8712_EDCASETTING_ + 0x18) +#define VI_ADMTIME (RTL8712_EDCASETTING_ + 0x1C) +#define BE_ADMTIME (RTL8712_EDCASETTING_ + 0x20) +#define RL (RTL8712_EDCASETTING_ + 0x24) + +#endif /* __RTL8712_EDCASETTING_REGDEF_H__ */ + |
