Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-beck.git] / drivers / net / can / sja1000 / peak_pcmcia.c

diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index 0a707f70661c7ca24d84bb165aef274654a4c56a..f7ad754dd2aa1427380b79eabf6c661d6114ba48 100644 (file)
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -196,7 +196,7 @@ static void pcan_write_canreg(const struct sja1000_priv *priv, int port, u8 v)
        int c = (priv->reg_base - card->ioport_addr) / PCC_CHAN_SIZE;
 
        /* sja1000 register changes control the leds state */
-       if (port == REG_MOD)
+       if (port == SJA1000_MOD)
                switch (v) {
                case MOD_RM:
                        /* Reset Mode: set led on */
@@ -509,11 +509,11 @@ static void pcan_free_channels(struct pcan_pccard *card)
 static inline int pcan_channel_present(struct sja1000_priv *priv)
 {
        /* make sure SJA1000 is in reset mode */
-       pcan_write_canreg(priv, REG_MOD, 1);
-       pcan_write_canreg(priv, REG_CDR, CDR_PELICAN);
+       pcan_write_canreg(priv, SJA1000_MOD, 1);
+       pcan_write_canreg(priv, SJA1000_CDR, CDR_PELICAN);
 
        /* read reset-values */
-       if (pcan_read_canreg(priv, REG_CDR) == CDR_PELICAN)
+       if (pcan_read_canreg(priv, SJA1000_CDR) == CDR_PELICAN)
                return 1;
 
        return 0;