diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2013-05-29 21:56:46 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-29 21:56:46 +0200 |
| commit | 774439518ac01049e9bf44f2fa4c604981f39dbf (patch) | |
| tree | b324e2e129ee4d9dcb1c1466590ce71d087e8158 /include/linux/ssb | |
| parent | iwlwifi: mvm: add debugfs for powersave (diff) | |
| parent | cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'include/linux/ssb')
| -rw-r--r-- | include/linux/ssb/ssb_regs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h index 3a7256955b10..f9f931c89e3e 100644 --- a/include/linux/ssb/ssb_regs.h +++ b/include/linux/ssb/ssb_regs.h @@ -172,6 +172,7 @@ #define SSB_SPROMSIZE_WORDS_R4 220 #define SSB_SPROMSIZE_BYTES_R123 (SSB_SPROMSIZE_WORDS_R123 * sizeof(u16)) #define SSB_SPROMSIZE_BYTES_R4 (SSB_SPROMSIZE_WORDS_R4 * sizeof(u16)) +#define SSB_SPROMSIZE_WORDS_R10 230 #define SSB_SPROM_BASE1 0x1000 #define SSB_SPROM_BASE31 0x0800 #define SSB_SPROM_REVISION 0x007E |