Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable

[safe/jmp/linux-2.6] / sound / pci / ice1712 / amp.c

diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c
index 6e22d32..e328cfb 100644 (file)
--- a/sound/pci/ice1712/amp.c
+++ b/sound/pci/ice1712/amp.c
@@ -3,7 +3,7 @@
  *
  *   Lowlevel functions for Advanced Micro Peripherals Ltd AUDIO2000
  *
- *     Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *     Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -21,12 +21,10 @@
  *
  */      
 
-#include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
-#include <linux/slab.h>
 #include <sound/core.h>
 
 #include "ice1712.h"
@@ -53,11 +51,13 @@ static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice)
 
        /* only use basic functionality for now */
 
-       ice->num_total_dacs = 2;        /* only PSDOUT0 is connected */
+       /* VT1616 6ch codec connected to PSDOUT0 using packed mode */
+       ice->num_total_dacs = 6;
        ice->num_total_adcs = 2;
 
-       /* Chaintech AV-710 has another codecs, which need initialization */
-       /* initialize WM8728 codec */
+       /* Chaintech AV-710 has another WM8728 codec connected to PSDOUT4
+          (shared with the SPDIF output). Mixer control for this codec
+          is not yet supported. */
        if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AV710) {
                for (i = 0; i < ARRAY_SIZE(wm_inits); i += 2)
                        wm_put(ice, wm_inits[i], wm_inits[i+1]);
@@ -75,7 +75,7 @@ static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice)
 
 
 /* entry point */
-const struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = {
+struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = {
        {
                .subvendor = VT1724_SUBDEVICE_AV710,
                .name = "Chaintech AV-710",