aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Ma <boyu.mt@taobao.com>2012-12-17 18:59:37 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-17 20:15:12 -0500
commit8f6e60419645f7fea84c361ca2c16dd1feee08e4 (patch)
treedbc053cc1f62e26b7174d1b192a298788e1de456
parent8ec7d50f1ed2b072d23ce810f86df09ee0568d4b (diff)
sound: remove reference to feature-removal-schedule.txt
In commit 9c0ece069b32 ("Get rid of Documentation/feature-removal.txt"), Linus removed feature-removal-schedule.txt from Documentation, but there is still some reference to this file. So remove them. Signed-off-by: Tao Ma <boyu.mt@taobao.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--sound/Kconfig3
-rw-r--r--sound/sound_core.c3
2 files changed, 1 insertions, 5 deletions
diff --git a/sound/Kconfig b/sound/Kconfig
index 261a03c8a209..c710ce2c5c37 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -52,9 +52,6 @@ config SOUND_OSS_CORE_PRECLAIM
52 52
53 Disabling this allows alternative OSS implementations. 53 Disabling this allows alternative OSS implementations.
54 54
55 Please read Documentation/feature-removal-schedule.txt for
56 details.
57
58 If unsure, say Y. 55 If unsure, say Y.
59 56
60source "sound/oss/dmasound/Kconfig" 57source "sound/oss/dmasound/Kconfig"
diff --git a/sound/sound_core.c b/sound/sound_core.c
index fb9255cca214..bb23009edc8d 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -146,8 +146,7 @@ extern int msnd_pinnacle_init(void);
146 * devices only the standard chrdev aliases are requested. 146 * devices only the standard chrdev aliases are requested.
147 * 147 *
148 * All these clutters are scheduled to be removed along with 148 * All these clutters are scheduled to be removed along with
149 * sound-slot/service-* module aliases. Please take a look at 149 * sound-slot/service-* module aliases.
150 * feature-removal-schedule.txt for details.
151 */ 150 */
152#ifdef CONFIG_SOUND_OSS_CORE_PRECLAIM 151#ifdef CONFIG_SOUND_OSS_CORE_PRECLAIM
153static int preclaim_oss = 1; 152static int preclaim_oss = 1;