From eb48a2631f27e0b37660858f01234218ab994034 Mon Sep 17 00:00:00 2001 From: Ondrej Zary Date: Sat, 19 Mar 2011 16:33:01 +0100 Subject: [PATCH] --- yaml --- r: 248137 b: refs/heads/master c: f8960d61bc8ba945b07a4de1288aac5d52f8607b h: refs/heads/master i: 248135: eb15934aed86a113a59b7fc13edc32104e2813db v: v3 --- [refs] | 2 +- trunk/include/sound/tea575x-tuner.h | 1 - trunk/sound/pci/fm801.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9164abb40433..493731bcfbcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 375d135818f32bbe7b3f071bd54d977c4ff8d84a +refs/heads/master: f8960d61bc8ba945b07a4de1288aac5d52f8607b diff --git a/trunk/include/sound/tea575x-tuner.h b/trunk/include/sound/tea575x-tuner.h index 3d6cdd80df59..5aade569439b 100644 --- a/trunk/include/sound/tea575x-tuner.h +++ b/trunk/include/sound/tea575x-tuner.h @@ -37,7 +37,6 @@ struct snd_tea575x_ops { struct snd_tea575x { struct snd_card *card; struct video_device *vd; /* video device */ - int dev_nr; /* requested device number + 1 */ bool tea5759; /* 5759 chip is present */ bool mute; /* Device is muted? */ bool stereo; /* receiving stereo */ diff --git a/trunk/sound/pci/fm801.c b/trunk/sound/pci/fm801.c index e1baad74ea4b..f4dc1c77202b 100644 --- a/trunk/sound/pci/fm801.c +++ b/trunk/sound/pci/fm801.c @@ -1453,7 +1453,6 @@ static int __devinit snd_fm801_create(struct snd_card *card, #ifdef TEA575X_RADIO if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 && (tea575x_tuner & TUNER_TYPE_MASK) < 4) { - chip->tea.dev_nr = tea575x_tuner >> 16; chip->tea.card = card; chip->tea.freq_fixup = 10700; chip->tea.private_data = chip;