summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2004-03-05 15:39:48 +0000
committerGerd Knorr <devnull@localhost>2004-03-05 15:39:48 +0000
commit82b2d6930fd7bb41b71617ca5eba804605af5513 (patch)
treee12631fc0fc6a4bdcb627871750b5da51c5837e2 /linux/include
parentfaee4a0ef457ebde343292fad383df29c77b562b (diff)
downloadmediapointer-dvb-s2-82b2d6930fd7bb41b71617ca5eba804605af5513.tar.gz
mediapointer-dvb-s2-82b2d6930fd7bb41b71617ca5eba804605af5513.tar.bz2
- more cards supported in ir-kbd-gpio.c
- add magics to video-buf structs. - fix saa7134 oss driver spinlocks. - misc minor stuff.
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/media/video-buf.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/include/media/video-buf.h b/linux/include/media/video-buf.h
index 507743a01..097b41a3d 100644
--- a/linux/include/media/video-buf.h
+++ b/linux/include/media/video-buf.h
@@ -59,6 +59,8 @@ struct scatterlist* videobuf_pages_to_sg(struct page **pages, int nr_pages,
*/
struct videobuf_dmabuf {
+ u32 magic;
+
/* for userland buffer */
int offset;
struct page **pages;
@@ -134,6 +136,7 @@ enum videobuf_state {
struct videobuf_buffer {
unsigned int i;
+ u32 magic;
/* info about the buffer */
unsigned int width;