diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-09-06 18:39:07 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-09-06 18:39:07 +0100 |
| commit | ed129684f8f1715a59248d413db621a71c96e285 (patch) | |
| tree | c1885a9dafa95a57475321f1ed328aeed2e27754 /v4l | |
| parent | 254094433ada550c4411ed47b20d0fd13f490d21 (diff) | |
| parent | 6b59fbe5fa40581818289f66c6337c300056bda8 (diff) | |
| download | mediapointer-dvb-s2-ed129684f8f1715a59248d413db621a71c96e285.tar.gz mediapointer-dvb-s2-ed129684f8f1715a59248d413db621a71c96e285.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/fusionhdtv
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 | 10 | ||||
| -rw-r--r-- | v4l/versions.txt | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index 4c7ee52a0..17ffc7830 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -204,6 +204,16 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) return page_to_pfn(vmalloc_to_page(vmalloc_addr)); } +static unsigned long kvirt_to_pa(unsigned long adr) +{ + unsigned long kva, ret; + + kva = (unsigned long) page_address(vmalloc_to_page((void *)adr)); + kva |= adr & (PAGE_SIZE-1); /* restore the offset */ + ret = __pa(kva); + return ret; +} + #ifndef wait_event_timeout #define wait_event_timeout(wq, condition, timeout) \ ({ \ diff --git a/v4l/versions.txt b/v4l/versions.txt index 285927146..963fe9251 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -79,6 +79,7 @@ VIDEO_CX88_DVB_CX22702 VIDEO_CX88_DVB_LGDT330X VIDEO_CX88_DVB_NXT200X VIDEO_CX88_DVB_CX24123 +VIDEO_CX23885 VIDEO_MSP3400 VIDEO_CS53L32A VIDEO_WM8775 @@ -176,6 +177,11 @@ VIDEO_IR VIDEO_TVEEPROM VIDEO_CX2341X VIDEO_USBVIDEO +TUNER_MT20XX +TUNER_TDA8290 +TUNER_TEA5761 +TUNER_TEA5767 +TUNER_SIMPLE USB_VICAM USB_IBMCAM VIDEO_TLV320AIC23B |