summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-06-15 15:20:09 +0200
committerTakashi Iwai <tiwai@suse.de>2011-06-15 15:20:09 +0200
commitaea76e1c1fb1554f6e33822da7765705c027428a (patch)
treee7d4c8981b8e839f2aa4aca8886f36543183dcce /sound
parent4f14e94d8c193a693f8aeacff5c15ebd9b5ffbc3 (diff)
parente72888e91cc902ccdc089f237b6eed7587e2b4df (diff)
Merge branch 'fix/misc' into for-next
Diffstat (limited to 'sound')
-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;