diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-21 07:45:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-21 07:45:30 -0300 |
| commit | 0b6f4aa0fc0cf793e97744580ad53e46f3f1bd95 (patch) | |
| tree | 2d2736f6914749502bdf0de211c78d1d56048d68 /linux/include | |
| parent | 865624af6da8960703f03756ab73c5438c1eff23 (diff) | |
| parent | a40b333c721d9353c3b7b98a22084e2c15095220 (diff) | |
| download | mediapointer-dvb-s2-0b6f4aa0fc0cf793e97744580ad53e46f3f1bd95.tar.gz mediapointer-dvb-s2-0b6f4aa0fc0cf793e97744580ad53e46f3f1bd95.tar.bz2 | |
merge: http://linuxtv.org/hg/~hhackmann/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/tuner.h | 2 | ||||
| -rw-r--r-- | linux/include/media/videobuf-core.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 1bf24a6ed..77068fcc8 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -78,7 +78,7 @@ #define TUNER_HITACHI_NTSC 40 #define TUNER_PHILIPS_PAL_MK 41 -#define TUNER_PHILIPS_ATSC 42 +#define TUNER_PHILIPS_FCV1236D 42 #define TUNER_PHILIPS_FM1236_MK3 43 #define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */ diff --git a/linux/include/media/videobuf-core.h b/linux/include/media/videobuf-core.h index b73f0ffa8..b94057eac 100644 --- a/linux/include/media/videobuf-core.h +++ b/linux/include/media/videobuf-core.h @@ -155,7 +155,7 @@ struct videobuf_queue { struct semaphore vb_lock; #endif spinlock_t *irqlock; - void *dev; /* on pci, points to struct pci_dev */ + struct device *dev; enum v4l2_buf_type type; unsigned int inputs; /* for V4L2_BUF_FLAG_INPUT */ @@ -189,7 +189,7 @@ void *videobuf_alloc(struct videobuf_queue* q); void videobuf_queue_core_init(struct videobuf_queue *q, struct videobuf_queue_ops *ops, - void *dev, + struct device *dev, spinlock_t *irqlock, enum v4l2_buf_type type, enum v4l2_field field, |