diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2009-06-20 09:42:15 -0700 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2009-06-20 09:42:15 -0700 |
| commit | fd98131ec0038d3c799a78d6247b1f76777d5160 (patch) | |
| tree | 5650a2071fd70a668eddeead9456cc81f5f882b4 | |
| parent | b6b5cafa2594a09626f8a3a4d23bbb0f1b712941 (diff) | |
| download | mediapointer-dvb-s2-fd98131ec0038d3c799a78d6247b1f76777d5160.tar.gz mediapointer-dvb-s2-fd98131ec0038d3c799a78d6247b1f76777d5160.tar.bz2 | |
compat: Fix __fls for certain ARM kernels
From: Trent Piepho <xyzzy@speakeasy.org>
__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 <xyzzy@speakeasy.org>
| -rw-r--r-- | v4l/compat.h | 1 |
1 files changed, 1 insertions, 0 deletions
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) { |