From 4a6bbeaac2bad0499453db64f219d10ce59ed1e2 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 23 Mar 2011 10:35:57 -0300 Subject: [PATCH] --- yaml --- r: 250197 b: refs/heads/master c: 5398b622152767aa70f2ac92d952c4c045aa86b5 h: refs/heads/master i: 250195: 1ebcc2e20cc9183e42afdd5942b93aefee9f1152 v: v3 --- [refs] | 2 +- trunk/Documentation/video4linux/Zoran | 1 - trunk/drivers/media/video/zoran/zoran_card.c | 8 -------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 08f7cca7a9dd..237fd713a52a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 945b876600054081911d31bdb4f47b172c8a48ae +refs/heads/master: 5398b622152767aa70f2ac92d952c4c045aa86b5 diff --git a/trunk/Documentation/video4linux/Zoran b/trunk/Documentation/video4linux/Zoran index c40e3bab08fa..9ed629d4874b 100644 --- a/trunk/Documentation/video4linux/Zoran +++ b/trunk/Documentation/video4linux/Zoran @@ -130,7 +130,6 @@ Card number: 4 Note: No module for the mse3000 is available yet Note: No module for the vpx3224 is available yet -Note: use encoder=X or decoder=X for non-default i2c chips =========================== diff --git a/trunk/drivers/media/video/zoran/zoran_card.c b/trunk/drivers/media/video/zoran/zoran_card.c index ba6878b2d663..79b04ac0f1ad 100644 --- a/trunk/drivers/media/video/zoran/zoran_card.c +++ b/trunk/drivers/media/video/zoran/zoran_card.c @@ -64,14 +64,6 @@ static int card[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 }; module_param_array(card, int, NULL, 0444); MODULE_PARM_DESC(card, "Card type"); -static int encoder[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 }; -module_param_array(encoder, int, NULL, 0444); -MODULE_PARM_DESC(encoder, "Video encoder chip"); - -static int decoder[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 }; -module_param_array(decoder, int, NULL, 0444); -MODULE_PARM_DESC(decoder, "Video decoder chip"); - /* The video mem address of the video card. The driver has a little database for some videocards