diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-11 10:49:24 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-11 10:49:24 -0500 |
| commit | d9a577c35a5f874cb11d96993dec26775e9738f7 (patch) | |
| tree | d993d7e3ff97e4ef9b082c950c8becd85d24eb92 /drivers/net/wireless/iwlwifi/iwl-prph.h | |
| parent | d6b5075d73adbc10fac873ca86798e30c115a018 (diff) | |
| parent | 9d10849e4ea8bf9d8da80afa73918a9fe45c09ef (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-prph.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-prph.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h index a70c7b9d9bad..f6412dae2659 100644 --- a/drivers/net/wireless/iwlwifi/iwl-prph.h +++ b/drivers/net/wireless/iwlwifi/iwl-prph.h @@ -102,6 +102,9 @@ /* Device system time */ #define DEVICE_SYSTEM_TIME_REG 0xA0206C +/* Device NMI register */ +#define DEVICE_SET_NMI_REG 0x00a01c30 + /***************************************************************************** * 7000/3000 series SHR DTS addresses * *****************************************************************************/ |