diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-28 18:26:16 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-28 18:26:16 -0200 |
| commit | 0991b38929edc3f7202157c6a1e04682ad9694cc (patch) | |
| tree | 3176f3d96c1a7909ca2a867fe67e3a89027fef5d /v4l | |
| parent | d444e8da71bac607984628cfa49b0f89c02a2db9 (diff) | |
| parent | 0e856055f505320ad16b590b1b9b1ca5341064ab (diff) | |
| download | mediapointer-dvb-s2-0991b38929edc3f7202157c6a1e04682ad9694cc.tar.gz mediapointer-dvb-s2-0991b38929edc3f7202157c6a1e04682ad9694cc.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 2 | ||||
| -rw-r--r-- | v4l/compat.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 0b2f54c99..abc53110c 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -270,7 +270,7 @@ clean:: @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \ - config-compat.h + config-compat.h Module.symvers distclean:: clean -rm -f .version .*.o.flags .*.o.d Makefile.media \ diff --git a/v4l/compat.h b/v4l/compat.h index c3745b4b1..c92eedc4e 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -358,10 +358,11 @@ usb_to_input_id(const struct usb_device *dev, struct input_id *id) #define vmalloc_32_user(a) vmalloc_32(a) -typedef int bool; #endif -#ifndef true +/* bool type and enum-based definition of true and false was added in 2.6.19 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) +typedef int bool; #define true 1 #define false 0 #endif |