aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Baechle2012-05-30 21:16:16 +0100
committerJiri Kosina2012-06-03 12:04:08 +0200
commit92a9f14b8b8e5ade5b49bcd6b95fc05f85a39e90 (patch)
tree9136b67606ab5d831f836b8a61d31dfba54fc5f2
parentd766023eea566bb3c2a57a0567af5b271908fdc2 (diff)
Fix comment typo multipy -> multiply
Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/input/misc/cma3000_d0x.c2
-rw-r--r--sound/oss/vwsnd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c
index a3735a01e9fd..df9b756594f8 100644
--- a/drivers/input/misc/cma3000_d0x.c
+++ b/drivers/input/misc/cma3000_d0x.c
@@ -58,7 +58,7 @@
/*
* Bit weights in mg for bit 0, other bits need
- * multipy factor 2^n. Eight bit is the sign bit.
+ * multiply factor 2^n. Eight bit is the sign bit.
*/
#define BIT_TO_2G 18
#define BIT_TO_8G 71
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c
index 643f1113b1d8..7e814a5c3677 100644
--- a/sound/oss/vwsnd.c
+++ b/sound/oss/vwsnd.c
@@ -438,7 +438,7 @@ static __inline__ void li_writeb(lithium_t *lith, int off, unsigned char val)
*
* Observe that (mask & -mask) is (1 << low_set_bit_of(mask)).
* As long as mask is constant, we trust the compiler will change the
- * multipy and divide into shifts.
+ * multiply and divide into shifts.
*/
#define SHIFT_FIELD(val, mask) (((val) * ((mask) & -(mask))) & (mask))