From fd98131ec0038d3c799a78d6247b1f76777d5160 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Sat, 20 Jun 2009 09:42:15 -0700 Subject: compat: Fix __fls for certain ARM kernels From: Trent Piepho __fls() has a broken definition for ARM in from v2.6.26-7260-g0c65f45 to v2.6.28-rc6-187-g94fc733. We can fix this by just undef'ing __fls before the compat define. This will let us replace the broken one with our working one. For those kernels where the compat code is triggered and __fls works, we replace the working one with our (identical) working version, which is not a problem. Priority: normal Signed-off-by: Trent Piepho --- v4l/compat.h | 1 + 1 file changed, 1 insertion(+) diff --git a/v4l/compat.h b/v4l/compat.h index ce28da615..4e554add0 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -462,6 +462,7 @@ static inline int snd_card_create(int idx, const char *id, defined(__x86_64__) || \ (BITS_PER_LONG == 64 && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26))) /* This define will prevent breakage if __fls was already defined. */ +#undef __fls #define __fls v4l_compat_fls static inline unsigned long v4l_compat_fls(unsigned long x) { -- cgit v1.2.3