Merge branch 'topic/memdup_user' into for-linus
[linux-2.6.git] / sound / isa / wavefront / wavefront_fx.c
index 5e6870b..2bb1cee 100644 (file)
 
 #define WAIT_IDLE      0xff
 
-#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
-#include "yss225.c"
-static const struct firmware yss225_registers_firmware = {
-       .data = (u8 *)yss225_registers,
-       .size = sizeof yss225_registers
-};
-#endif
-
 static int
 wavefront_fx_idle (snd_wavefront_t *dev)
 
@@ -256,16 +248,12 @@ snd_wavefront_fx_start (snd_wavefront_t *dev)
        if (dev->fx_initialized)
                return 0;
 
-#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
-       firmware = &yss225_registers_firmware;
-#else
        err = request_firmware(&firmware, "yamaha/yss225_registers.bin",
                               dev->card->dev);
        if (err < 0) {
                err = -1;
                goto out;
        }
-#endif
 
        for (i = 0; i + 1 < firmware->size; i += 2) {
                if (firmware->data[i] >= 8 && firmware->data[i] < 16) {
@@ -288,12 +276,8 @@ snd_wavefront_fx_start (snd_wavefront_t *dev)
        err = 0;
 
 out:
-#ifndef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
        release_firmware(firmware);
-#endif
        return err;
 }
 
-#ifndef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
 MODULE_FIRMWARE("yamaha/yss225_registers.bin");
-#endif