Merge tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs

[karo-tx-linux.git] / drivers / net / can / sja1000 / ems_pci.c

diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
index 36d298da2af6afb4c4ed5b7780c8f9dc11df0311..3752342a678ac5320e68bf69f747b4f69034758d 100644 (file)
--- a/drivers/net/can/sja1000/ems_pci.c
+++ b/drivers/net/can/sja1000/ems_pci.c
@@ -168,12 +168,12 @@ static inline int ems_pci_check_chan(const struct sja1000_priv *priv)
        unsigned char res;
 
        /* Make sure SJA1000 is in reset mode */
-       priv->write_reg(priv, REG_MOD, 1);
+       priv->write_reg(priv, SJA1000_MOD, 1);
 
-       priv->write_reg(priv, REG_CDR, CDR_PELICAN);
+       priv->write_reg(priv, SJA1000_CDR, CDR_PELICAN);
 
        /* read reset-values */
-       res = priv->read_reg(priv, REG_CDR);
+       res = priv->read_reg(priv, SJA1000_CDR);
 
        if (res == CDR_PELICAN)
                return 1;