aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/lola/lola_pcm.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-01-29 04:48:30 -0500
committerJiri Kosina <jkosina@suse.cz>2013-01-29 04:48:30 -0500
commit617677295b53a40d0e54aac4cbbc216ffbc755dd (patch)
tree51b9e87213243ed5efff252c8e8d8fec4eebc588 /sound/pci/lola/lola_pcm.c
parent5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff)
parent6abb7c25775b7fb2225ad0508236d63ca710e65f (diff)
Merge branch 'master' into for-next
Conflicts: drivers/devfreq/exynos4_bus.c Sync with Linus' tree to be able to apply patches that are against newer code (mvneta).
Diffstat (limited to 'sound/pci/lola/lola_pcm.c')
-rw-r--r--sound/pci/lola/lola_pcm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/lola/lola_pcm.c b/sound/pci/lola/lola_pcm.c
index c44db68eecb5..5ea85e8b83ab 100644
--- a/sound/pci/lola/lola_pcm.c
+++ b/sound/pci/lola/lola_pcm.c
@@ -597,7 +597,7 @@ static struct snd_pcm_ops lola_pcm_ops = {
597 .page = snd_pcm_sgbuf_ops_page, 597 .page = snd_pcm_sgbuf_ops_page,
598}; 598};
599 599
600int __devinit lola_create_pcm(struct lola *chip) 600int lola_create_pcm(struct lola *chip)
601{ 601{
602 struct snd_pcm *pcm; 602 struct snd_pcm *pcm;
603 int i, err; 603 int i, err;
@@ -690,7 +690,7 @@ static int lola_init_stream(struct lola *chip, struct lola_stream *str,
690 return 0; 690 return 0;
691} 691}
692 692
693int __devinit lola_init_pcm(struct lola *chip, int dir, int *nidp) 693int lola_init_pcm(struct lola *chip, int dir, int *nidp)
694{ 694{
695 struct lola_pcm *pcm = &chip->pcm[dir]; 695 struct lola_pcm *pcm = &chip->pcm[dir];
696 int i, nid, err; 696 int i, nid, err;