X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=sound%2Foss%2Faedsp16.c;h=a0274f3dac08874f6f3092cfb946bb04381973e7;hb=02d0e6753d8ab0173b63338157929e52eac86d12;hp=51e1fde62e8d5685bed6fc44ef0fdd9bd0dc896a;hpb=c4e00fac42f268ed0a547cdd1d12bb8399864040;p=linux-2.6-omap-h63xx.git

diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c
index 51e1fde62e8..a0274f3dac0 100644
--- a/sound/oss/aedsp16.c
+++ b/sound/oss/aedsp16.c
@@ -28,14 +28,6 @@
 #include <linux/init.h>
 #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