Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346348
b: refs/heads/master
c: 8f6e604
h: refs/heads/master
v: v3
  • Loading branch information
Tao Ma authored and Linus Torvalds committed Dec 18, 2012
1 parent d558810 commit 25ea3f8
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8ec7d50f1ed2b072d23ce810f86df09ee0568d4b
refs/heads/master: 8f6e60419645f7fea84c361ca2c16dd1feee08e4
3 changes: 0 additions & 3 deletions trunk/sound/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions trunk/sound/sound_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 25ea3f8

Please sign in to comment.