diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-21 15:06:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-21 15:06:51 -0300 |
| commit | 85a3fd2b44d6162a4288a264537c287adf79b4f9 (patch) | |
| tree | f6ab20e3a4cb92bb7b28ab8bf1217013a2fd07fd | |
| parent | ba1331c45ace13485b9d68ac3f2d574f1e80e229 (diff) | |
| parent | fd98131ec0038d3c799a78d6247b1f76777d5160 (diff) | |
| download | mediapointer-dvb-s2-85a3fd2b44d6162a4288a264537c287adf79b4f9.tar.gz mediapointer-dvb-s2-85a3fd2b44d6162a4288a264537c287adf79b4f9.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/fix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -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 f9e450798..6b3504706 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -466,6 +466,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) { |