aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core/seq/seq_dummy.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-04-07 12:28:00 +0200
committerTakashi Iwai <tiwai@suse.de>2012-04-07 12:28:00 +0200
commitc38f62b08d800104fa9b0e9d6e9141459986c06d (patch)
tree1d04d768c8aa0c1a544d1f068317c7beb0101be2 /sound/core/seq/seq_dummy.c
parentALSA: hda - clean up CX20549 test mixer setup (diff)
parentASoC: tegra: fix i2s compilation when !CONFIG_DEBUG_FS (diff)
downloadlinux-dev-c38f62b08d800104fa9b0e9d6e9141459986c06d.tar.xz
linux-dev-c38f62b08d800104fa9b0e9d6e9141459986c06d.zip
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: fixes for 3.4 A bunch of driver-specific fixes and one generic fix for the new support for platform DAPM contexts - we were picking the wrong default for the idle_bias_off setting which was meaning we weren't actually achieving any useful runtime PM on platform devices.
Diffstat (limited to 'sound/core/seq/seq_dummy.c')
-rw-r--r--sound/core/seq/seq_dummy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c
index bbe32d2177d9..dbc550716790 100644
--- a/sound/core/seq/seq_dummy.c
+++ b/sound/core/seq/seq_dummy.c
@@ -46,7 +46,7 @@
The number of ports to be created can be specified via the module
parameter "ports". For example, to create four ports, add the
- following option in /etc/modprobe.conf:
+ following option in a configuration file under /etc/modprobe.d/:
option snd-seq-dummy ports=4