diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 15:17:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 15:17:14 +0200 |
| commit | 620f2efcdc5c7a2db68da41bc3df3cf9a718024e (patch) | |
| tree | b1a0411e2588953777d0b10245b12044c33cef54 /sound/oss/aedsp16.c | |
| parent | x86: xsave: set FP, SSE bits in the xsave header in the user sigcontext (diff) | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt... (diff) | |
| download | linux-620f2efcdc5c7a2db68da41bc3df3cf9a718024e.tar.xz linux-620f2efcdc5c7a2db68da41bc3df3cf9a718024e.zip | |
Merge branch 'linus' into x86/xsave
Diffstat (limited to 'sound/oss/aedsp16.c')
| -rw-r--r-- | sound/oss/aedsp16.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c index 51e1fde62e8d..a0274f3dac08 100644 --- a/sound/oss/aedsp16.c +++ b/sound/oss/aedsp16.c @@ -29,14 +29,6 @@ #include "sound_config.h" /* - * Sanity checks - */ - -#if defined(CONFIG_SOUND_AEDSP16_SBPRO) && defined(CONFIG_SOUND_AEDSP16_MSS) -#error You have to enable only one of the MSS and SBPRO emulations. -#endif - -/* READ THIS |