Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[karo-tx-linux.git] / drivers / w1 / w1_io.c

diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c
index 282092421cc9ee29d541e8722139387d0060c7db..f4bc8c100a01b1f04a62ebca2528c51c05f40520 100644 (file)
--- a/drivers/w1/w1_io.c
+++ b/drivers/w1/w1_io.c
@@ -352,7 +352,7 @@ int w1_reset_bus(struct w1_master *dev)
                w1_delay(70);
 
                result = dev->bus_master->read_bit(dev->bus_master->data) & 0x1;
-               /* minmum 70 (above) + 430 = 500 us
+               /* minimum 70 (above) + 430 = 500 us
                 * There aren't any timing requirements between a reset and
                 * the following transactions.  Sleeping is safe here.
                 */