Merge remote-tracking branches 'spi/fix/lock', 'spi/fix/maintainers', 'spi/fix/put...

[deliverable/linux.git] / sound / oss / aedsp16.c

diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c
index 35b5912cf3f81fa36d181fdb44f1f35be5d92d79..bb477d5c8528611776abee1fe7584f1d65389d89 100644 (file)
--- a/sound/oss/aedsp16.c
+++ b/sound/oss/aedsp16.c
@@ -482,13 +482,13 @@ static struct orVals orDMA[] __initdata = {
 };
 
 static struct aedsp16_info ae_config = {
-       DEF_AEDSP16_IOB,
-       DEF_AEDSP16_IRQ,
-       DEF_AEDSP16_MRQ,
-       DEF_AEDSP16_DMA,
-       -1,
-       -1,
-       INIT_NONE
+       .base_io = DEF_AEDSP16_IOB,
+       .irq = DEF_AEDSP16_IRQ,
+       .mpu_irq = DEF_AEDSP16_MRQ,
+       .dma = DEF_AEDSP16_DMA,
+       .mss_base = -1,
+       .mpu_base = -1,
+       .init = INIT_NONE
 };
 
 /*