Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[platform/kernel/linux-starfive.git] / drivers / net / can / m_can / m_can.c

diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 7931f9c..afaaeb6 100644 (file)
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -1348,8 +1348,8 @@ static void m_can_chip_config(struct net_device *dev)
        /* set bittiming params */
        m_can_set_bittiming(dev);
 
-       /* enable internal timestamp generation, with a prescalar of 16. The
-        * prescalar is applied to the nominal bit timing
+       /* enable internal timestamp generation, with a prescaler of 16. The
+        * prescaler is applied to the nominal bit timing
         */
        m_can_write(cdev, M_CAN_TSCC,
                    FIELD_PREP(TSCC_TCP_MASK, 0xf) |