diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-09-16 16:40:38 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-16 16:40:38 +0200 |
| commit | 779608521976e3b8d264f89c67e64c918949cc9b (patch) | |
| tree | 12d604aa1a08b5bf556be11ee9c08b5b6b000179 /lib/string.c | |
| parent | 7a9744cb455e6faa287e148394b4b422a6f3c5c4 (diff) | |
| parent | f7667af21736eb231e3589d9f91183d325cabfbe (diff) | |
Merge tag 'asoc-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17
This is mostly driver fixes, the biggest one being the tlv320aic31xx
which is relatively large but simple and device specific. There's a
small fix in the error handling in DPCM too which is relatively minor
error handling fix.
Diffstat (limited to 'lib/string.c')
| -rw-r--r-- | lib/string.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/string.c b/lib/string.c index 992bf30af759..f3c6ff596414 100644 --- a/lib/string.c +++ b/lib/string.c @@ -807,9 +807,9 @@ void *memchr_inv(const void *start, int c, size_t bytes) return check_bytes8(start, value, bytes); value64 = value; -#if defined(ARCH_HAS_FAST_MULTIPLIER) && BITS_PER_LONG == 64 +#if defined(CONFIG_ARCH_HAS_FAST_MULTIPLIER) && BITS_PER_LONG == 64 value64 *= 0x0101010101010101; -#elif defined(ARCH_HAS_FAST_MULTIPLIER) +#elif defined(CONFIG_ARCH_HAS_FAST_MULTIPLIER) value64 *= 0x01010101; value64 |= value64 << 32; #else |