summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885/cx23885.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-09 22:56:59 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-09 22:56:59 -0300
commita9e5a96e3a38b1089b19496b26ebfd6d308d48e3 (patch)
tree41835b4264bb6ad7af269818771d44266b526c22 /linux/drivers/media/video/cx23885/cx23885.h
parent2af26e6a68740096134e432bc8b0fbf46cbd0a27 (diff)
parent8edb4b5501818f40fd0c88d29df0cfb28edabb99 (diff)
downloadmediapointer-dvb-s2-a9e5a96e3a38b1089b19496b26ebfd6d308d48e3.tar.gz
mediapointer-dvb-s2-a9e5a96e3a38b1089b19496b26ebfd6d308d48e3.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/saa7134
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx23885/cx23885.h')
-rw-r--r--linux/drivers/media/video/cx23885/cx23885.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885.h b/linux/drivers/media/video/cx23885/cx23885.h
index cae0a74bd..e8118c6bd 100644
--- a/linux/drivers/media/video/cx23885/cx23885.h
+++ b/linux/drivers/media/video/cx23885/cx23885.h
@@ -71,6 +71,7 @@
#define CX23885_BOARD_TBS_6920 14
#define CX23885_BOARD_TEVII_S470 15
#define CX23885_BOARD_DVBWORLD_2005 16
+#define CX23885_BOARD_NETUP_DUAL_DVBS2_CI 17
/* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
#define CX23885_NORMS (\
@@ -188,6 +189,7 @@ struct cx23885_board {
*/
u32 clk_freq;
struct cx23885_input input[MAX_CX23885_INPUT];
+ int cimax; /* for NetUP */
};
struct cx23885_subid {
@@ -270,6 +272,7 @@ struct cx23885_tsport {
/* Allow a single tsport to have multiple frontends */
u32 num_frontends;
+ void *port_priv;
};
struct cx23885_dev {