From 25ea3f8a7b5b4f4de219a16f21bc896d4112312c Mon Sep 17 00:00:00 2001 From: Tao Ma Date: Mon, 17 Dec 2012 15:59:37 -0800 Subject: [PATCH] --- yaml --- r: 346348 b: refs/heads/master c: 8f6e60419645f7fea84c361ca2c16dd1feee08e4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/Kconfig | 3 --- trunk/sound/sound_core.c | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 33d034938b29..3189a9307ec6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ec7d50f1ed2b072d23ce810f86df09ee0568d4b +refs/heads/master: 8f6e60419645f7fea84c361ca2c16dd1feee08e4 diff --git a/trunk/sound/Kconfig b/trunk/sound/Kconfig index 261a03c8a209..c710ce2c5c37 100644 --- a/trunk/sound/Kconfig +++ b/trunk/sound/Kconfig @@ -52,9 +52,6 @@ config SOUND_OSS_CORE_PRECLAIM Disabling this allows alternative OSS implementations. - Please read Documentation/feature-removal-schedule.txt for - details. - If unsure, say Y. source "sound/oss/dmasound/Kconfig" diff --git a/trunk/sound/sound_core.c b/trunk/sound/sound_core.c index fb9255cca214..bb23009edc8d 100644 --- a/trunk/sound/sound_core.c +++ b/trunk/sound/sound_core.c @@ -146,8 +146,7 @@ extern int msnd_pinnacle_init(void); * devices only the standard chrdev aliases are requested. * * All these clutters are scheduled to be removed along with - * sound-slot/service-* module aliases. Please take a look at - * feature-removal-schedule.txt for details. + * sound-slot/service-* module aliases. */ #ifdef CONFIG_SOUND_OSS_CORE_PRECLAIM static int preclaim_oss = 1;