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 09:25:46 -0700 |
| commit | d95e938c1d975948e5eb02b1cdf996df9bba64fd (patch) | |
| tree | 0fcfb85bc0bc5fba0732930c2d1f1ad62e9696ba /drivers/Kconfig | |
| parent | f67b04d44657c874c34ea461633463803755a7c9 (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/Kconfig')
0 files changed, 0 insertions, 0 deletions