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/ems_pcmcia.c | |
| parent | bf7bfd7ff0a8e85c5f469a24c27d4dd1eb756104 (diff) | |
| parent | 06e1d1d71876c75bf4a9d3b310c1b4df34e8be69 (diff) | |
| download | blackbird-op-linux-264f0ef766d6e9fcc1b4c3afd288a20ee05ef541.tar.gz blackbird-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/ems_pcmcia.c')
| -rw-r--r-- | drivers/net/can/sja1000/ems_pcmcia.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/sja1000/ems_pcmcia.c b/drivers/net/can/sja1000/ems_pcmcia.c index 5c2f3fbbf5ae..a3aa6817b515 100644 --- a/drivers/net/can/sja1000/ems_pcmcia.c +++ b/drivers/net/can/sja1000/ems_pcmcia.c @@ -126,11 +126,11 @@ static irqreturn_t ems_pcmcia_interrupt(int irq, void *dev_id) static inline int ems_pcmcia_check_chan(struct sja1000_priv *priv) { /* Make sure SJA1000 is in reset mode */ - ems_pcmcia_write_reg(priv, REG_MOD, 1); - ems_pcmcia_write_reg(priv, REG_CDR, CDR_PELICAN); + ems_pcmcia_write_reg(priv, SJA1000_MOD, 1); + ems_pcmcia_write_reg(priv, SJA1000_CDR, CDR_PELICAN); /* read reset-values */ - if (ems_pcmcia_read_reg(priv, REG_CDR) == CDR_PELICAN) + if (ems_pcmcia_read_reg(priv, SJA1000_CDR) == CDR_PELICAN) return 1; return 0; |
