diff options
author | Oliver Hartkopp <socketcan@hartkopp.net> | 2013-04-13 15:35:49 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-04-16 06:39:14 -0400 |
commit | 06e1d1d71876c75bf4a9d3b310c1b4df34e8be69 (patch) | |
tree | 0f2a63b251e240c86500051d961a931f2b0752bc /drivers/net/can/sja1000/peak_pci.c | |
parent | 61f47132dcba1eacf8fd8e64488d0b6d4bcbe4a0 (diff) |
can: sja1000: use common prefix for all sja1000 defines
This is a follow up patch to:
f901b6b can: sja1000: fix define conflict on SH
That patch fixed a define conflict between the SH architecture and the sja1000
driver, by addind a prefix to one macro only. This patch consistently renames
the prefix of the SJA1000 controller registers from "REG_" to "SJA1000_".
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/sja1000/peak_pci.c')
-rw-r--r-- | drivers/net/can/sja1000/peak_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c index d1e7f1006ddd..6b6f0ad75090 100644 --- a/drivers/net/can/sja1000/peak_pci.c +++ b/drivers/net/can/sja1000/peak_pci.c | |||
@@ -402,7 +402,7 @@ static void peak_pciec_write_reg(const struct sja1000_priv *priv, | |||
402 | int c = (priv->reg_base - card->reg_base) / PEAK_PCI_CHAN_SIZE; | 402 | int c = (priv->reg_base - card->reg_base) / PEAK_PCI_CHAN_SIZE; |
403 | 403 | ||
404 | /* sja1000 register changes control the leds state */ | 404 | /* sja1000 register changes control the leds state */ |
405 | if (port == REG_MOD) | 405 | if (port == SJA1000_MOD) |
406 | switch (val) { | 406 | switch (val) { |
407 | case MOD_RM: | 407 | case MOD_RM: |
408 | /* Reset Mode: set led on */ | 408 | /* Reset Mode: set led on */ |