diff -urpN --exclude-from=/home/davej/.exclude bk-linus/sound/oss/gus_wave.c linux-2.5/sound/oss/gus_wave.c
--- bk-linus/sound/oss/gus_wave.c 2003-05-26 12:57:43.000000000 +0100
+++ linux-2.5/sound/oss/gus_wave.c 2003-07-13 13:33:57.000000000 +0100
@@ -3034,7 +3034,7 @@ void __init gus_wave_init(struct address
gus_initialize();
- if ((gus_mem_size > 0) & !gus_no_wave_dma)
+ if ((gus_mem_size > 0) && !gus_no_wave_dma)
{
hw_config->slots[4] = -1;
if ((gus_devnum = sound_install_audiodrv(AUDIO_DRIVER_VERSION,