summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-08-20 06:13:50 +0000
committerMichael Krufky <devnull@localhost>2005-08-20 06:13:50 +0000
commitdabe13290fb6b4a6bce2df2ebb8cd93df7a400e0 (patch)
treeac431780de25c20db016e13abd98aba3663e2523 /linux/drivers/media/video/cx88
parent0e72d16763f0256a4c1c5189618b1f544ba3906d (diff)
downloadmediapointer-dvb-s2-dabe13290fb6b4a6bce2df2ebb8cd93df7a400e0.tar.gz
mediapointer-dvb-s2-dabe13290fb6b4a6bce2df2ebb8cd93df7a400e0.tar.bz2
removed nested #if 1
Diffstat (limited to 'linux/drivers/media/video/cx88')
-rw-r--r--linux/drivers/media/video/cx88/cx88-blackbird.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c
index 704259ec6..d5841f58a 100644
--- a/linux/drivers/media/video/cx88/cx88-blackbird.c
+++ b/linux/drivers/media/video/cx88/cx88-blackbird.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-blackbird.c,v 1.33 2005/08/17 20:55:37 catalin Exp $
+ * $Id: cx88-blackbird.c,v 1.34 2005/08/20 06:13:50 mkrufky Exp $
*
* Support for a cx23416 mpeg encoder via cx2388x host port.
* "blackbird" reference design.
@@ -1206,7 +1206,7 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
#if 0
down(&dev->lock);
init_controls(core);
-#if 1
+/* #if 1 */
/* force norm to PAL */
{
int i;
@@ -1217,9 +1217,9 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
break;
}
}
-#else
+/* #else */
cx88_set_tvnorm(core,tvnorms);
-#endif
+/* #endif */
video_mux(core,0);
up(&dev->lock);
#endif