diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-03-27 11:36:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-05 10:04:16 -0700 |
| commit | bb4619ed5fd25a8ec2dd5f8841c9e3662539af26 (patch) | |
| tree | bd6545e7166c823f88e2c846f589efb6aef8deda /drivers/net/can/sja1000/sja1000.h | |
| parent | cde9833c97c4ad06e569e1f0e7e6b1c84c948aa3 (diff) | |
can: sja1000: fix define conflict on SH
commit f901b6bc404b67d96eca739857c097e022727b71 upstream.
Thias patch fixes a define conflict between the SH architecture and the sja1000
driver:
drivers/net/can/sja1000/sja1000.h:59:0: warning:
"REG_SR" redefined [enabled by default]
arch/sh/include/asm/ptrace_32.h:25:0: note:
this is the location of the previous definition
A SJA1000_ prefix is added to the offending sja1000 define only, to make a
minimal patch suited for stable. A later patch will add a SJA1000_ prefix to
all defines in sja1000.h.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 23fff06875f5..2a79543f34cd 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 |