Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / w1 / masters / ds1wm.c

diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 530a2d30906308fbbc864ecf421ecd8ae47f60f3..7c294f4dc0ed85bcaad3f36719509b134f55d5a9 100644 (file)
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -349,7 +349,7 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
                        "pass: %d entering ASM\n", pass);
                ds1wm_write_register(ds1wm_data, DS1WM_CMD, DS1WM_CMD_SRA);
                dev_dbg(&ds1wm_data->pdev->dev,
-                       "pass: %d begining nibble loop\n", pass);
+                       "pass: %d beginning nibble loop\n", pass);
 
                r_prime = 0;
                d = 0;