aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
58 58
59/* 59/*
60 * Bit weights in mg for bit 0, other bits need 60 * Bit weights in mg for bit 0, other bits need
61 * multipy factor 2^n. Eight bit is the sign bit. 61 * multiply factor 2^n. Eight bit is the sign bit.
62 */ 62 */
63#define BIT_TO_2G 18 63#define BIT_TO_2G 18
64#define BIT_TO_8G 71 64#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)
438 * 438 *
439 * Observe that (mask & -mask) is (1 << low_set_bit_of(mask)). 439 * Observe that (mask & -mask) is (1 << low_set_bit_of(mask)).
440 * As long as mask is constant, we trust the compiler will change the 440 * As long as mask is constant, we trust the compiler will change the
441 * multipy and divide into shifts. 441 * multiply and divide into shifts.
442 */ 442 */
443 443
444#define SHIFT_FIELD(val, mask) (((val) * ((mask) & -(mask))) & (mask)) 444#define SHIFT_FIELD(val, mask) (((val) * ((mask) & -(mask))) & (mask))