diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
commit | d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de (patch) | |
tree | 1e8c402df9b1154f4ca37eb5242f960ef7aab747 /include/asm-generic/bitops/fls.h | |
parent | ALSA: Add missing KERN_* prefix to printk in other sound/* (diff) | |
parent | ALSA: Add subdevice_mask field to quirk entries (diff) | |
download | linux-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.tar.xz linux-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.zip |
Merge branch 'topic/quirk-cleanup' into topic/misc
Diffstat (limited to 'include/asm-generic/bitops/fls.h')
-rw-r--r-- | include/asm-generic/bitops/fls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h index 850859bc5069..0576d1f42f43 100644 --- a/include/asm-generic/bitops/fls.h +++ b/include/asm-generic/bitops/fls.h @@ -9,7 +9,7 @@ * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. */ -static inline int fls(int x) +static __always_inline int fls(int x) { int r = 32; |