aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-03-30 16:37:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 19:03:15 -0400
commit970e2486492aa1eb47a436a5a4c81e92558986a9 (patch)
tree5c321b58b536695b513f21b9b8d5431f0db88ac5 /sound/drivers
parent096015236df46c64be8b86e41fd4e28522e5f7e5 (diff)
Documentation: remove references to /etc/modprobe.conf
Usage of /etc/modprobe.conf file was deprecated by module-init-tools and is no longer parsed by new kmod tool. References to this file are replaced in Documentation, comments and Kconfig according to the context. There are also some references to the old /etc/modules.conf from 2.4 kernels that are being removed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi> Acked-by: Takashi Iwai <tiwai@suse.de> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/drivers')
-rw-r--r--sound/drivers/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index c8961165277c..fe5ae09ffccb 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -50,7 +50,8 @@ config SND_PCSP
50 before the other sound driver of yours, making the 50 before the other sound driver of yours, making the
51 pc-speaker a default sound device. Which is likely not 51 pc-speaker a default sound device. Which is likely not
52 what you want. To make this driver play nicely with other 52 what you want. To make this driver play nicely with other
53 sound driver, you can add this into your /etc/modprobe.conf: 53 sound driver, you can add this in a configuration file under
54 /etc/modprobe.d/ directory:
54 options snd-pcsp index=2 55 options snd-pcsp index=2
55 56
56 You don't need this driver if you only want your pc-speaker to beep. 57 You don't need this driver if you only want your pc-speaker to beep.