]> git.karo-electronics.de Git - linux-beck.git/commit
can: sja1000: fix define conflict on SH
authorMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 27 Mar 2013 10:36:42 +0000 (11:36 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 27 Mar 2013 12:39:42 +0000 (13:39 +0100)
commitf901b6bc404b67d96eca739857c097e022727b71
treea10fb8044e405304dcff6affb6b6a029934e44f2
parentb175293ccc98ab84e93d25472d7422b4a897614b
can: sja1000: fix define conflict on SH

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.

Cc: linux-stable <stable@vger.kernel.org>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/sja1000/plx_pci.c
drivers/net/can/sja1000/sja1000.c
drivers/net/can/sja1000/sja1000.h