diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-18 09:40:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-18 09:40:43 -0300 |
| commit | 9dc9f909cf3815bc60336feecea6dce9f437f042 (patch) | |
| tree | 995941d39233691aab80d0a61cd5c0e402aede17 /linux/include | |
| parent | b1fad223c39000c4e5e8be80928035406ae8ccce (diff) | |
| parent | bf840a1818e11630aa2cd995cb96fca712d1a314 (diff) | |
| download | mediapointer-dvb-s2-9dc9f909cf3815bc60336feecea6dce9f437f042.tar.gz mediapointer-dvb-s2-9dc9f909cf3815bc60336feecea6dce9f437f042.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tda18271
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/ir-common.h | 1 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 2 | ||||
| -rw-r--r-- | linux/include/media/videobuf-core.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h index a4274203f..20f1afe21 100644 --- a/linux/include/media/ir-common.h +++ b/linux/include/media/ir-common.h @@ -107,6 +107,7 @@ extern IR_KEYTAB_TYPE ir_codes_avermedia[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_avermedia_dvbt[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_apac_viewcomp[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE]; +extern IR_KEYTAB_TYPE ir_codes_pixelview_new[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_nebula[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_dntv_live_dvb_t[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_iodata_bctv7e[IR_KEYTAB_SIZE]; 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, |