diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /sound/Kconfig | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'sound/Kconfig')
-rw-r--r-- | sound/Kconfig | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/Kconfig b/sound/Kconfig index 439e15c8faa3..fcad760f5691 100644 --- a/sound/Kconfig +++ b/sound/Kconfig | |||
@@ -1,6 +1,3 @@ | |||
1 | # sound/Config.in | ||
2 | # | ||
3 | |||
4 | menuconfig SOUND | 1 | menuconfig SOUND |
5 | tristate "Sound card support" | 2 | tristate "Sound card support" |
6 | depends on HAS_IOMEM | 3 | depends on HAS_IOMEM |
@@ -58,7 +55,7 @@ config SOUND_OSS_CORE_PRECLAIM | |||
58 | Please read Documentation/feature-removal-schedule.txt for | 55 | Please read Documentation/feature-removal-schedule.txt for |
59 | details. | 56 | details. |
60 | 57 | ||
61 | If unusre, say Y. | 58 | If unsure, say Y. |
62 | 59 | ||
63 | source "sound/oss/dmasound/Kconfig" | 60 | source "sound/oss/dmasound/Kconfig" |
64 | 61 | ||
@@ -136,4 +133,3 @@ config AC97_BUS | |||
136 | sound subsystem and other function drivers completely unrelated to | 133 | sound subsystem and other function drivers completely unrelated to |
137 | sound although they're sharing the AC97 bus. Concerned drivers | 134 | sound although they're sharing the AC97 bus. Concerned drivers |
138 | should "select" this. | 135 | should "select" this. |
139 | |||