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_cmdctrl_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_cmdctrl_regdef.h')
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h b/drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h new file mode 100644 index 0000000..5d9a3f2 --- /dev/null +++ b/drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h @@ -0,0 +1,15 @@ +#ifndef __RTL8712_CMDCTRL_REGDEF_H__ +#define __RTL8712_CMDCTRL_REGDEF_H__ + + +#define CR (RTL8712_CMDCTRL_ + 0x0000) +#define TXPAUSE (RTL8712_CMDCTRL_ + 0x0002) +#define TCR (RTL8712_CMDCTRL_ + 0x0004) +#define RCR (RTL8712_CMDCTRL_ + 0x0008) +#define MSR (RTL8712_CMDCTRL_ + 0x000C) +#define SYSF_CFG (RTL8712_CMDCTRL_ + 0x000D) +#define MBIDCTRL (RTL8712_CMDCTRL_ + 0x000E) + + +#endif /* __RTL8712_CMDCTRL_REGDEF_H__ */ + |