diff options
author | Ingo Molnar | 2013-04-19 13:03:08 +0200 |
---|---|---|
committer | Ingo Molnar | 2013-04-19 13:03:08 +0200 |
commit | 5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e (patch) | |
tree | 524d8ac34cc8c7ef68b43e3ee6e08e27db86299c /drivers/net/can/sja1000/sja1000.h | |
parent | Merge tag 'please-pull-cmci_rediscover' of git://git.kernel.org/pub/scm/linux... (diff) | |
parent | amd64_edac: Add Family 16h support (diff) | |
download | kernel-qcow2-linux-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.gz kernel-qcow2-linux-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.xz kernel-qcow2-linux-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.zip |
Merge tag 'edac_amd_f16h' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull AMD F16h support for amd64_edac from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/can/sja1000/sja1000.h')
-rw-r--r-- | drivers/net/can/sja1000/sja1000.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/sja1000/sja1000.h b/drivers/net/can/sja1000/sja1000.h index afa99847a510..aa48e053da27 100644 --- a/drivers/net/can/sja1000/sja1000.h +++ b/drivers/net/can/sja1000/sja1000.h @@ -56,7 +56,7 @@ /* SJA1000 registers - manual section 6.4 (Pelican Mode) */ #define REG_MOD 0x00 #define REG_CMR 0x01 -#define REG_SR 0x02 +#define SJA1000_REG_SR 0x02 #define REG_IR 0x03 #define REG_IER 0x04 #define REG_ALC 0x0B |