patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / sound / pci / ice1712 / delta.c

diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index a5ba80c..85fc5e4 100644 (file)
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -692,56 +692,64 @@ static int __devinit snd_ice1712_delta_add_controls(ice1712_t *ice)
 /* entry point */
 struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = {
        {
-               ICE1712_SUBDEVICE_DELTA1010,
-               "M Audio Delta 1010",
-               snd_ice1712_delta_init,
-               snd_ice1712_delta_add_controls,
+               .subvendor = ICE1712_SUBDEVICE_DELTA1010,
+               .name = "M Audio Delta 1010",
+               .model = "delta1010",
+               .chip_init = snd_ice1712_delta_init,
+               .build_controls = snd_ice1712_delta_add_controls,
        },
        {
-               ICE1712_SUBDEVICE_DELTADIO2496,
-               "M Audio Delta DiO 2496",
-               snd_ice1712_delta_init,
-               snd_ice1712_delta_add_controls,
-               1, /* NO MPU */
+               .subvendor = ICE1712_SUBDEVICE_DELTADIO2496,
+               .name = "M Audio Delta DiO 2496",
+               .model = "dio2496",
+               .chip_init = snd_ice1712_delta_init,
+               .build_controls = snd_ice1712_delta_add_controls,
+               .no_mpu401 = 1,
        },
        {
-               ICE1712_SUBDEVICE_DELTA66,
-               "M Audio Delta 66",
-               snd_ice1712_delta_init,
-               snd_ice1712_delta_add_controls,
-               1, /* NO MPU */
+               .subvendor = ICE1712_SUBDEVICE_DELTA66,
+               .name = "M Audio Delta 66",
+               .model = "delta66",
+               .chip_init = snd_ice1712_delta_init,
+               .build_controls = snd_ice1712_delta_add_controls,
+               .no_mpu401 = 1,
        },
        {
-               ICE1712_SUBDEVICE_DELTA44,
-               "M Audio Delta 44",
-               snd_ice1712_delta_init,
-               snd_ice1712_delta_add_controls,
-               1, /* NO MPU */
+               .subvendor = ICE1712_SUBDEVICE_DELTA44,
+               .name = "M Audio Delta 44",
+               .model = "delta44",
+               .chip_init = snd_ice1712_delta_init,
+               .build_controls = snd_ice1712_delta_add_controls,
+               .no_mpu401 = 1,
        },
        {
-               ICE1712_SUBDEVICE_AUDIOPHILE,
-               "M Audio Audiophile 24/96",
-               snd_ice1712_delta_init,
-               snd_ice1712_delta_add_controls,
+               .subvendor = ICE1712_SUBDEVICE_AUDIOPHILE,
+               .name = "M Audio Audiophile 24/96",
+               .model = "audiophile",
+               .chip_init = snd_ice1712_delta_init,
+               .build_controls = snd_ice1712_delta_add_controls,
        },
        {
-               ICE1712_SUBDEVICE_DELTA410,
-               "M Audio Delta 410",
-               snd_ice1712_delta_init,
-               snd_ice1712_delta_add_controls,
+               .subvendor = ICE1712_SUBDEVICE_DELTA410,
+               .name = "M Audio Delta 410",
+               .model = "delta410",
+               .chip_init = snd_ice1712_delta_init,
+               .build_controls = snd_ice1712_delta_add_controls,
        },
        {
-               ICE1712_SUBDEVICE_DELTA1010LT,
-               "M Audio Delta 1010LT",
-               snd_ice1712_delta_init,
-               snd_ice1712_delta_add_controls,
+               .subvendor = ICE1712_SUBDEVICE_DELTA1010LT,
+               .name = "M Audio Delta 1010LT",
+               .model = "delta1010lt",
+               .chip_init = snd_ice1712_delta_init,
+               .build_controls = snd_ice1712_delta_add_controls,
        },
        {
-               ICE1712_SUBDEVICE_VX442,
-               "Digigram VX442",
-               snd_ice1712_delta_init,
-               snd_ice1712_delta_add_controls,
-               1, /* NO MPU */
+               .subvendor = ICE1712_SUBDEVICE_VX442,
+               .name = "Digigram VX442",
+               .model = "vx442",
+               .chip_init = snd_ice1712_delta_init,
+               .build_controls = snd_ice1712_delta_add_controls,
+               .no_mpu401 = 1,
        },
        { } /* terminator */
 };