summaryrefslogtreecommitdiffstats
path: root/sound/pci/lola
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-06-17 14:54:47 +0200
committerTakashi Iwai <tiwai@suse.de>2011-06-17 14:54:47 +0200
commit3409fcd1f71d02025e3f179127a8ba243c525d78 (patch)
tree365b2e3f8901c358f6ea216c2ba03e7a1f48a359 /sound/pci/lola
parentALSA: firewire-speakers, oxygen, ua101: allow > 10 s periods (diff)
parentALSA: hda - Fix no NID error with VIA codecs (diff)
downloadlinux-3409fcd1f71d02025e3f179127a8ba243c525d78.tar.xz
linux-3409fcd1f71d02025e3f179127a8ba243c525d78.zip
Merge branch 'fix/hda' into topic/misc
Diffstat (limited to 'sound/pci/lola')
-rw-r--r--sound/pci/lola/lola.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c
index 1dc6f5b1d668..3e92e5b5ec3d 100644
--- a/sound/pci/lola/lola.c
+++ b/sound/pci/lola/lola.c
@@ -445,7 +445,7 @@ static void lola_reset_setups(struct lola *chip)
lola_setup_all_analog_gains(chip, PLAY, false); /* output, update */
}
-static int lola_parse_tree(struct lola *chip)
+static int __devinit lola_parse_tree(struct lola *chip)
{
unsigned int val;
int nid, err;