---

yaml --- r: 30073 b: refs/heads/master c: 45f87a2 h: refs/heads/master i: 30071: 835c368 v: v3
git-mirror · Jun 25, 2006 · 0dfd8c3 · 0dfd8c3
1 parent 31a80d8
commit 0dfd8c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 153962364dc6fa4a24571885fbe76506d8968610
+refs/heads/master: 45f87a21735804760dd7db0e2e3c609c332b15e3
diff --git a/trunk/drivers/media/video/cx88/cx88-blackbird.c b/trunk/drivers/media/video/cx88/cx88-blackbird.c
@@ -1045,21 +1045,10 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
 	cx2341x_fill_defaults(&dev->params);
 	dev->params.port = CX2341X_PORT_STREAMING;
 
-	switch (core->board) {
-	case CX88_BOARD_HAUPPAUGE_ROSLYN:
-		if (core->tuner_formats & V4L2_STD_525_60) {
-			dev->height = 480;
-		} else {
-			dev->height = 576;
-		}
-		break;
-	case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
-		if (core->tvnorm->id & V4L2_STD_525_60) {
-			dev->height = 480;
-		} else {
-			dev->height = 576;
-		}
-		break;
+	if (core->tvnorm->id & V4L2_STD_525_60) {
+		dev->height = 480;
+	} else {
+		dev->height = 576;
 	}
 
 	err = cx8802_init_common(dev);