aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 16:03:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 16:03:55 -0700
commita9d38a4f2da6c49a257253a9fdef7a6bcb0e0e4f (patch)
treed97875ecd47172c8739ec8f24ea159bbee8fb628 /sound
parent9613bebb223dea3179c265dc31e1bb41ae39f321 (diff)
parentc48013824b855c4498092aa6f2fa5345962c1f65 (diff)
downloadlinux-a9d38a4f2da6c49a257253a9fdef7a6bcb0e0e4f.tar.gz
Merge branch 'dunlap' (Randy's Documentation patches)
Merge Documentation fixes from Randy Dunlap. Fixed up several small annoyances (bad changelogs and corrupted utf8 names), I need to try to convince people to do things right. * emailed from Randy Dunlap <rdunlap@xenotime.net>: Documentation: fix typo in ABI/stable/sysfs-driver-usb-usbtmc Documentation: replace install commands with softdeps Documentation: remove references to /etc/modprobe.conf Documentation: input.txt: clarify mousedev 'cat' command syntax Documentation: CodingStyle: add inline assembly guidelines Documentation: sysrq: Crutcher Dunnavant is unavailable Documentation: mention scripts/diffconfig tool Documentation: remove 'mach' from dontdiff file
Diffstat (limited to 'sound')
-rw-r--r--sound/core/seq/seq_dummy.c2
-rw-r--r--sound/drivers/Kconfig3
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c
index bbe32d2177d..dbc55071679 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
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index c8961165277..fe5ae09ffcc 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -50,7 +50,8 @@ config SND_PCSP
before the other sound driver of yours, making the
pc-speaker a default sound device. Which is likely not
what you want. To make this driver play nicely with other
- sound driver, you can add this into your /etc/modprobe.conf:
+ sound driver, you can add this in a configuration file under
+ /etc/modprobe.d/ directory:
options snd-pcsp index=2
You don't need this driver if you only want your pc-speaker to beep.