aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/cx23885/cx23885.h
diff options
context:
space:
mode:
authorSteven Toth <stoth@hauppauge.com>2007-03-19 19:22:41 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 22:08:06 -0300
commite133be0f587996f112d7984c03606af418a7ca05 (patch)
tree3b78505e5b265d7d95db6f7bfc0835aa15ed5788 /drivers/media/video/cx23885/cx23885.h
parent0fc0739ba940c07e97599a7ee04c24faae9808ed (diff)
V4L/DVB (6157): Removed the need to manually define .bridge for each card
Moved the field from cx23885_board to cx23885_dev and added code to iautomatically set the bridge type based on the pci device id. Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885.h')
-rw-r--r--drivers/media/video/cx23885/cx23885.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 04105bcf53f..4e1fc68d420 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -101,11 +101,6 @@ struct cx23885_board {
CX23885_MPEG_UNDEFINED = 0,
CX23885_MPEG_DVB
} portc;
- enum {
- CX23885_BRIDGE_UNDEFINED = 0,
- CX23885_BRIDGE_885 = 885,
- CX23885_BRIDGE_887 = 887,
- } bridge;
struct cx23885_input input[MAX_CX23885_INPUT];
};
@@ -210,6 +205,12 @@ struct cx23885_dev {
/* sram configuration */
struct sram_channel *sram_channels;
+
+ enum {
+ CX23885_BRIDGE_UNDEFINED = 0,
+ CX23885_BRIDGE_885 = 885,
+ CX23885_BRIDGE_887 = 887,
+ } bridge;
};
#define SRAM_CH01 0 /* Video A */