diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /sound/pci/ice1712/ice1712.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'sound/pci/ice1712/ice1712.c')
| -rw-r--r-- | sound/pci/ice1712/ice1712.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 4fc6d8bc637e..f4594d76b6ea 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
| @@ -2755,7 +2755,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
| 2755 | return err; | 2755 | return err; |
| 2756 | } | 2756 | } |
| 2757 | if (c->mpu401_1_name) | 2757 | if (c->mpu401_1_name) |
| 2758 | /* Prefered name available in card_info */ | 2758 | /* Preferred name available in card_info */ |
| 2759 | snprintf(ice->rmidi[0]->name, | 2759 | snprintf(ice->rmidi[0]->name, |
| 2760 | sizeof(ice->rmidi[0]->name), | 2760 | sizeof(ice->rmidi[0]->name), |
| 2761 | "%s %d", c->mpu401_1_name, card->number); | 2761 | "%s %d", c->mpu401_1_name, card->number); |
| @@ -2772,7 +2772,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
| 2772 | return err; | 2772 | return err; |
| 2773 | } | 2773 | } |
| 2774 | if (c->mpu401_2_name) | 2774 | if (c->mpu401_2_name) |
| 2775 | /* Prefered name available in card_info */ | 2775 | /* Preferred name available in card_info */ |
| 2776 | snprintf(ice->rmidi[1]->name, | 2776 | snprintf(ice->rmidi[1]->name, |
| 2777 | sizeof(ice->rmidi[1]->name), | 2777 | sizeof(ice->rmidi[1]->name), |
| 2778 | "%s %d", c->mpu401_2_name, | 2778 | "%s %d", c->mpu401_2_name, |