diff options
| author |   Oliver Hartkopp <socketcan@hartkopp.net> | 2013-04-13 21:35:49 +0200 |
|---|---|---|
| committer |   Marc Kleine-Budde <mkl@pengutronix.de> | 2013-04-16 12:39:14 +0200 |
| commit | 06e1d1d71876c75bf4a9d3b310c1b4df34e8be69 (patch) | |
| tree | 0f2a63b251e240c86500051d961a931f2b0752bc /drivers/net/can/sja1000/kvaser_pci.c | |
| parent | Merge branch 'sync_multiple' (diff) | |
| download | linux-dev-06e1d1d71876c75bf4a9d3b310c1b4df34e8be69.tar.xz linux-dev-06e1d1d71876c75bf4a9d3b310c1b4df34e8be69.zip | |
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/kvaser_pci.c')
| -rw-r--r-- | drivers/net/can/sja1000/kvaser_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/sja1000/kvaser_pci.c b/drivers/net/can/sja1000/kvaser_pci.c index 37b0381f532e..217585b97cd3 100644 --- a/drivers/net/can/sja1000/kvaser_pci.c +++ b/drivers/net/can/sja1000/kvaser_pci.c @@ -159,9 +159,9 @@ static int number_of_sja1000_chip(void __iomem *base_addr) for (i = 0; i < MAX_NO_OF_CHANNELS; i++) { /* reset chip */ iowrite8(MOD_RM, base_addr + - (i * KVASER_PCI_PORT_BYTES) + REG_MOD); + (i * KVASER_PCI_PORT_BYTES) + SJA1000_MOD); status = ioread8(base_addr + - (i * KVASER_PCI_PORT_BYTES) + REG_MOD); + (i * KVASER_PCI_PORT_BYTES) + SJA1000_MOD); /* check reset bit */ if (!(status & MOD_RM)) break; |