diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-04 08:26:50 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-04 08:26:50 -0200 |
| commit | b46e1e93b7a6abd37652c7bcd2353cf6de4b68c0 (patch) | |
| tree | 68c0b260cd89163e9c6eaa80f98d58dbe297272b /v4l | |
| parent | 08650f2ce2368e8dcc8142f933b65aaf3777efef (diff) | |
| parent | db212a276b0513120a21ef0d6a64a3a753a3a215 (diff) | |
| download | mediapointer-dvb-s2-b46e1e93b7a6abd37652c7bcd2353cf6de4b68c0.tar.gz mediapointer-dvb-s2-b46e1e93b7a6abd37652c7bcd2353cf6de4b68c0.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tda8295
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 21 | ||||
| -rw-r--r-- | v4l/versions.txt | 6 |
2 files changed, 25 insertions, 2 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index db45d91f0..e4877e865 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -462,6 +462,27 @@ static inline unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate) } #endif +#ifndef task_pid_nr +# define task_pid_nr(current) ((current)->pid) +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) +# define sg_init_table(a,b) +# define sg_page(p) (sg->page) +# define sg_set_page(sglist,pg,sz,off) \ +do { \ + struct scatterlist *p=sglist; \ + p->page = pg; \ + p->length = sz; \ + p->offset = off; \ +} while (0) +#endif + +#ifndef BIT_MASK +# define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) +# define BIT_WORD(nr) ((nr) / BITS_PER_LONG) +#endif + #endif /* * Local variables: diff --git a/v4l/versions.txt b/v4l/versions.txt index bb6c766c5..affc221bb 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -11,6 +11,10 @@ VIDEO_TCM825X #This driver were developed at kernel 2.6.19, requiring vmalloc_user/remap_vmalloc_range VIDEO_CAFE_CCIC +# Uses remap_vmalloc_range() +[2.6.18] +VIDEOBUF_VMALLOC + # DVB_CORE_ATTACH relies on symbol_put_addr which hangs pre-2.6.17 [2.6.17] DVB_CORE_ATTACH @@ -184,8 +188,6 @@ DVB_TDA18271 VIDEO_SAA7146 VIDEO_SAA7146_VV VIDEO_TUNER -VIDEO_BUF -VIDEO_BUF_DVB VIDEO_BTCX VIDEO_IR VIDEO_TVEEPROM |