Merge branch 'for-4.0/upstream-fixes' into for-next

[karo-tx-linux.git] / sound / sh / aica.h

diff --git a/sound/sh/aica.h b/sound/sh/aica.h
index 0603b5b0376be3d98af68a62d8ef4f397aeb2301..d098baaa0116c2fc381a5aa5ebe217c74eeceb4a 100644 (file)
--- a/sound/sh/aica.h
+++ b/sound/sh/aica.h
@@ -52,7 +52,7 @@
 #define AICA_CHANNEL1_OFFSET 0x21000
 #define CHANNEL_OFFSET 0x10000
 
-#define AICA_DMA_CHANNEL 0
+#define AICA_DMA_CHANNEL 5
 #define AICA_DMA_MODE 5
 
 #define SND_AICA_DRIVER "AICA"
@@ -69,6 +69,7 @@ struct aica_channel {
 };
 
 struct snd_card_aica {
+       struct work_struct spu_dma_work;
        struct snd_card *card;
        struct aica_channel *channel;
        struct snd_pcm_substream *substream;