diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 17:35:39 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 17:35:39 -0200 |
| commit | 64ff6df9dc6bc8b48e19e9c2749625891aa0a509 (patch) | |
| tree | 514308429e2276e57071fdd5f55bcd342e00bad2 /v4l | |
| parent | a3f770256b79b9d59770a94bef4d01d4a1390a50 (diff) | |
| parent | 23d6b9bb8a5ed876d78947ba808e5ba5e6b2cf37 (diff) | |
| download | mediapointer-dvb-s2-64ff6df9dc6bc8b48e19e9c2749625891aa0a509.tar.gz mediapointer-dvb-s2-64ff6df9dc6bc8b48e19e9c2749625891aa0a509.tar.bz2 | |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 1 | ||||
| -rw-r--r-- | v4l/versions.txt | 3 |
2 files changed, 4 insertions, 0 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/versions.txt b/v4l/versions.txt index 0393e79b0..6d547a509 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -1,6 +1,9 @@ # Use this for stuff for drivers that don't compile [2.6.99] +[2.6.28] +USB_STV06XX + [2.6.26] # Needs camera.h VIDEO_PXA27x |