diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-03 00:22:11 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-03 00:22:11 +0200 |
| commit | cd02938a828f4b2098a074afb7454f106f2e8df5 (patch) | |
| tree | 7b543fd6aa82a62dc3a9614c26f89daca83e77d5 /drivers/media/video/cx18/cx18-vbi.h | |
| parent | [ARM] 5444/1: ARM: Realview: Fix event-device multiplicators in localtimer.c (diff) | |
| parent | ARM: Add SMSC911X support to Overo platform (V2) (diff) | |
| download | linux-cd02938a828f4b2098a074afb7454f106f2e8df5.tar.xz linux-cd02938a828f4b2098a074afb7454f106f2e8df5.zip | |
Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6
Diffstat (limited to 'drivers/media/video/cx18/cx18-vbi.h')
| -rw-r--r-- | drivers/media/video/cx18/cx18-vbi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-vbi.h b/drivers/media/video/cx18/cx18-vbi.h index c56ff7d28f20..e7e1ae427f34 100644 --- a/drivers/media/video/cx18/cx18-vbi.h +++ b/drivers/media/video/cx18/cx18-vbi.h @@ -22,5 +22,5 @@ */ void cx18_process_vbi_data(struct cx18 *cx, struct cx18_buffer *buf, - u64 pts_stamp, int streamtype); + int streamtype); int cx18_used_line(struct cx18 *cx, int line, int field); |