vserver 1.9.5.x5

[linux-2.6.git] / sound / pci / mixart / mixart.h

diff --git a/sound/pci/mixart/mixart.h b/sound/pci/mixart/mixart.h
index 573cdc0..4cde263 100644 (file)
--- a/sound/pci/mixart/mixart.h
+++ b/sound/pci/mixart/mixart.h
@@ -53,7 +53,7 @@ struct mixart_uid
 
 struct mem_area {
        unsigned long phys;
-       unsigned long virt;
+       void __iomem *virt;
        struct resource *res;
 };
 
@@ -115,7 +115,6 @@ struct snd_mixart_mgr {
        snd_hwdep_t *hwdep;
        unsigned int board_type;      /* read from embedded once elf file is loaded, 250 = miXart8, 251 = with AES, 252 = with Cobranet */
 
-       struct snd_dma_device dma_dev;
        struct snd_dma_buffer flowinfo;
        struct snd_dma_buffer bufferinfo;