diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-16 16:43:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-16 16:43:39 -0400 |
| commit | 264f0ef766d6e9fcc1b4c3afd288a20ee05ef541 (patch) | |
| tree | ed99023f742f6c9c8542c9631c8dfac77e71759c /drivers/net/can/sja1000/kvaser_pci.c | |
| parent | bf7bfd7ff0a8e85c5f469a24c27d4dd1eb756104 (diff) | |
| parent | 06e1d1d71876c75bf4a9d3b310c1b4df34e8be69 (diff) | |
| download | talos-op-linux-264f0ef766d6e9fcc1b4c3afd288a20ee05ef541.tar.gz talos-op-linux-264f0ef766d6e9fcc1b4c3afd288a20ee05ef541.zip | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
this is a pull-request for net-next/master. It consists of a patch by
Oliver Hartkopp. In this patch he cleans up the sja1000 header file by
using a common prefix for all sja1000 defines.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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; |
