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_timectrl_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_timectrl_regdef.h')
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_timectrl_regdef.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_timectrl_regdef.h b/drivers/staging/rtl8712/rtl8712_timectrl_regdef.h new file mode 100644 index 0000000..8a3dd56 --- /dev/null +++ b/drivers/staging/rtl8712/rtl8712_timectrl_regdef.h @@ -0,0 +1,20 @@ +#ifndef __RTL8712_TIMECTRL_REGDEF_H__ +#define __RTL8712_TIMECTRL_REGDEF_H__ + +#define TSFTR (RTL8712_TIMECTRL_ + 0x00) +#define USTIME (RTL8712_TIMECTRL_ + 0x08) +#define SLOT (RTL8712_TIMECTRL_ + 0x09) +#define TUBASE (RTL8712_TIMECTRL_ + 0x0A) +#define SIFS_CCK (RTL8712_TIMECTRL_ + 0x0C) +#define SIFS_OFDM (RTL8712_TIMECTRL_ + 0x0E) +#define PIFS (RTL8712_TIMECTRL_ + 0x10) +#define ACKTO (RTL8712_TIMECTRL_ + 0x11) +#define EIFS (RTL8712_TIMECTRL_ + 0x12) +#define BCNITV (RTL8712_TIMECTRL_ + 0x14) +#define ATIMWND (RTL8712_TIMECTRL_ + 0x16) +#define DRVERLYINT (RTL8712_TIMECTRL_ + 0x18) +#define BCNDMATIM (RTL8712_TIMECTRL_ + 0x1A) +#define BCNERRTH (RTL8712_TIMECTRL_ + 0x1C) +#define MLT (RTL8712_TIMECTRL_ + 0x1D) + +#endif /* __RTL8712_TIMECTRL_REGDEF_H__ */ |