diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bitops.h | 6 | ||||
| -rw-r--r-- | include/linux/fb.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index b25dc8742124..3112ae7d6524 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -203,7 +203,7 @@ static __always_inline __s64 sign_extend64(__u64 value, int index) return (__s64)(value << shift) >> shift; } -static inline unsigned fls_long(unsigned long l) +static inline unsigned int fls_long(unsigned long l) { if (sizeof(l) == 4) return fls(l); @@ -239,7 +239,7 @@ static inline int get_count_order_long(unsigned long l) * The result is not defined if no bits are set, so check that @word * is non-zero before calling this. */ -static inline unsigned long __ffs64(u64 word) +static inline unsigned int __ffs64(u64 word) { #if BITS_PER_LONG == 32 if (((u32)word) == 0UL) @@ -255,7 +255,7 @@ static inline unsigned long __ffs64(u64 word) * @word: The word to search * @n: Bit to find */ -static inline unsigned long fns(unsigned long word, unsigned int n) +static inline unsigned int fns(unsigned long word, unsigned int n) { unsigned int bit; diff --git a/include/linux/fb.h b/include/linux/fb.h index 811e47f9d1c3..b40754b545ad 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -12,7 +12,7 @@ #include <linux/types.h> #include <linux/workqueue.h> -#include <asm/fb.h> +#include <asm/video.h> struct backlight_device; struct device; |