diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-03-24 09:24:39 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-03-24 09:24:39 +0100 |
commit | 89c8ae73459443eabfd7f24b4379ddb9248f1ee9 (patch) | |
tree | e13e7c3a780668da718161305f2d1741c0b7ae6f /arch/cris/include/asm/bitops.h | |
parent | 2df6742f613840a0b0a1590fb28f7af5b058a673 (diff) | |
parent | e090d5b6ad20056ec0ef58727e3ae95fd82be090 (diff) |
Merge tag 'asoc-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.15
A few more updates for the merge window:
- Fixes for the simple-card DAI format DT mess.
- A new driver for Cirrus cs42xx8 devices.
- DT support for a couple more devices.
- A revert of a previous buggy fix for soc-pcm, plus a few more fixes
and cleanups.
Diffstat (limited to 'arch/cris/include/asm/bitops.h')
-rw-r--r-- | arch/cris/include/asm/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/include/asm/bitops.h b/arch/cris/include/asm/bitops.h index 184066ceb1f6..053c17b36559 100644 --- a/arch/cris/include/asm/bitops.h +++ b/arch/cris/include/asm/bitops.h @@ -144,7 +144,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr) * definition, which doesn't have the same semantics. We don't want to * use -fno-builtin, so just hide the name ffs. */ -#define ffs kernel_ffs +#define ffs(x) kernel_ffs(x) #include <asm-generic/bitops/fls.h> #include <asm-generic/bitops/__fls.h> |