diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-12-23 19:57:17 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-12-23 19:57:17 +0100 |
| commit | ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555 (patch) | |
| tree | 3aa28180723e897e8ae6704940ed70d0679ed680 /v4l | |
| parent | e3ed9d5ccedc1a7a60c7cf106fbfb795448b32ea (diff) | |
| parent | d8fa5b2669acb99dcbc246d93bef9f2028c1aff0 (diff) | |
| download | mediapointer-dvb-s2-ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555.tar.gz mediapointer-dvb-s2-ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 1 | ||||
| -rwxr-xr-x | v4l/scripts/release.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index ad2d9df22..49c89ea2d 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -34,6 +34,7 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) #define set_freezable() #define cancel_delayed_work_sync cancel_rearming_delayed_work +#define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM) #endif #ifndef __pure diff --git a/v4l/scripts/release.sh b/v4l/scripts/release.sh index 4e9c810bc..5055675d6 100755 --- a/v4l/scripts/release.sh +++ b/v4l/scripts/release.sh @@ -16,7 +16,7 @@ files_common="$files_v4l $files_tuner $files_i2c doc" files_ir="ir-common.[ch]" files_audio="msp3400.[ch] tvaudio.[ch] tvmixer.[ch]" -files_bttv="bt848.h btcx*.[ch] bttv*.[ch] bt832.[ch] ir-kbd*.c" +files_bttv="bt848.h btcx*.[ch] bttv*.[ch] ir-kbd*.c" files_saa="saa7134*.[ch] saa6752hs.[ch] ir-kbd-i2c.c" files_cx="btcx*.[ch] cx*.[ch]" |