summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2011-03-11 11:41:06 +0100
committerTakashi Iwai <tiwai@suse.de>2011-03-11 15:22:05 +0100
commit966a7f0dc4de57cf52467968e4244d218a5c3506 (patch)
tree0031516d822584226c02e77c38296c71cd173322 /sound
parenta6e8509f2172a6ac764a82763fce64836a108a14 (diff)
downloadlinux-3.10-966a7f0dc4de57cf52467968e4244d218a5c3506.tar.gz
linux-3.10-966a7f0dc4de57cf52467968e4244d218a5c3506.tar.bz2
linux-3.10-966a7f0dc4de57cf52467968e4244d218a5c3506.zip
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')
-rw-r--r--sound/pci/intel8x0m.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 8716b291cb7..2ae8d29500a 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -1109,7 +1109,7 @@ struct ich_reg_info {
static int __devinit snd_intel8x0m_create(struct snd_card *card,
struct pci_dev *pci,
unsigned long device_type,
- struct intel8x0m ** r_intel8x0)
+ struct intel8x0m **r_intel8x0m)
{
struct intel8x0m *chip;
int err;
@@ -1125,7 +1125,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
};
struct ich_reg_info *tbl;
- *r_intel8x0 = NULL;
+ *r_intel8x0m = NULL;
if ((err = pci_enable_device(pci)) < 0)
return err;
@@ -1238,7 +1238,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
snd_card_set_dev(card, &pci->dev);
- *r_intel8x0 = chip;
+ *r_intel8x0m = chip;
return 0;
}