diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 17:13:56 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 17:13:56 +0100 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /sound/oss/aedsp16.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
| download | lwn-e758936e02700ff88a0b08b722a3847b95283ef2.tar.gz lwn-e758936e02700ff88a0b08b722a3847b95283ef2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
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 |