Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel

[linux-2.6-omap-h63xx.git] / include / sound / snd_wavefront.h

diff --git a/include/sound/snd_wavefront.h b/include/sound/snd_wavefront.h
index 0b9e5de94ff10d8cdedf8dac10c3089271c26553..fa149ca77e4bea93b17ce07d4399a95c9cd111ca 100644 (file)
--- a/include/sound/snd_wavefront.h
+++ b/include/sound/snd_wavefront.h
@@ -1,7 +1,6 @@
 #ifndef __SOUND_SND_WAVEFRONT_H__
 #define __SOUND_SND_WAVEFRONT_H__
 
-#include "cs4231.h"
 #include "mpu401.h"
 #include "hwdep.h"
 #include "rawmidi.h"
@@ -85,6 +84,7 @@ struct _snd_wavefront {
        char hw_version[2];                /* major = [0], minor = [1] */
        char israw;                        /* needs Motorola microcode */
        char has_fx;                       /* has FX processor (Tropez+) */
+       char fx_initialized;               /* FX's register pages initialized */
        char prog_status[WF_MAX_PROGRAM];  /* WF_SLOT_* */
        char patch_status[WF_MAX_PATCH];   /* WF_SLOT_* */
        char sample_status[WF_MAX_SAMPLE]; /* WF_ST_* | WF_SLOT_* */
@@ -94,6 +94,7 @@ struct _snd_wavefront {
        spinlock_t irq_lock;
        wait_queue_head_t interrupt_sleeper; 
        snd_wavefront_midi_t midi;         /* ICS2115 MIDI interface */
+       struct snd_card *card;
 };
 
 struct _snd_wavefront_card {