diff options
author | Paul Bolle <pebolle@tiscali.nl> | 2011-03-11 05:41:06 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-03-11 09:22:05 -0500 |
commit | 966a7f0dc4de57cf52467968e4244d218a5c3506 (patch) | |
tree | 0031516d822584226c02e77c38296c71cd173322 /sound/pci/intel8x0m.c | |
parent | a6e8509f2172a6ac764a82763fce64836a108a14 (diff) |
ALSA: intel8x0m: append 'm' to "r_intel8x0"
Appending an 'm' will distinguish it from a similar struct in intel8x0.c
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/intel8x0m.c')
-rw-r--r-- | sound/pci/intel8x0m.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 8716b291cb7d..2ae8d29500a8 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
@@ -1109,7 +1109,7 @@ struct ich_reg_info { | |||
1109 | static int __devinit snd_intel8x0m_create(struct snd_card *card, | 1109 | static int __devinit snd_intel8x0m_create(struct snd_card *card, |
1110 | struct pci_dev *pci, | 1110 | struct pci_dev *pci, |
1111 | unsigned long device_type, | 1111 | unsigned long device_type, |
1112 | struct intel8x0m ** r_intel8x0) | 1112 | struct intel8x0m **r_intel8x0m) |
1113 | { | 1113 | { |
1114 | struct intel8x0m *chip; | 1114 | struct intel8x0m *chip; |
1115 | int err; | 1115 | int err; |
@@ -1125,7 +1125,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card, | |||
1125 | }; | 1125 | }; |
1126 | struct ich_reg_info *tbl; | 1126 | struct ich_reg_info *tbl; |
1127 | 1127 | ||
1128 | *r_intel8x0 = NULL; | 1128 | *r_intel8x0m = NULL; |
1129 | 1129 | ||
1130 | if ((err = pci_enable_device(pci)) < 0) | 1130 | if ((err = pci_enable_device(pci)) < 0) |
1131 | return err; | 1131 | return err; |
@@ -1238,7 +1238,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card, | |||
1238 | 1238 | ||
1239 | snd_card_set_dev(card, &pci->dev); | 1239 | snd_card_set_dev(card, &pci->dev); |
1240 | 1240 | ||
1241 | *r_intel8x0 = chip; | 1241 | *r_intel8x0m = chip; |
1242 | return 0; | 1242 | return 0; |
1243 | } | 1243 | } |
1244 | 1244 | ||