diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /sound/oss/aedsp16.c | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
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 @@ | |||
| 29 | #include "sound_config.h" | 29 | #include "sound_config.h" |
| 30 | 30 | ||
| 31 | /* | 31 | /* |
| 32 | * Sanity checks | ||
| 33 | */ | ||
| 34 | |||
| 35 | #if defined(CONFIG_SOUND_AEDSP16_SBPRO) && defined(CONFIG_SOUND_AEDSP16_MSS) | ||
| 36 | #error You have to enable only one of the MSS and SBPRO emulations. | ||
| 37 | #endif | ||
| 38 | |||
| 39 | /* | ||
| 40 | 32 | ||
| 41 | READ THIS | 33 | READ THIS |
| 42 | 34 | ||