vserver 1.9.5.x5

[linux-2.6.git] / include / sound / ymfpci.h

diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
index 67afeca..b874533 100644 (file)
--- a/include/sound/ymfpci.h
+++ b/include/sound/ymfpci.h
@@ -305,7 +305,7 @@ struct _snd_ymfpci {
        unsigned int device_id; /* PCI device ID */
        unsigned int rev;       /* PCI revision */
        unsigned long reg_area_phys;
-       unsigned long reg_area_virt;
+       void __iomem *reg_area_virt;
        struct resource *res_reg_area;
        struct resource *fm_res;
        struct resource *mpu_res;
@@ -316,7 +316,6 @@ struct _snd_ymfpci {
        struct gameport gameport;
 #endif
 
-       struct snd_dma_device dma_dev;
        struct snd_dma_buffer work_ptr;
 
        unsigned int bank_size_playback;
@@ -390,14 +389,6 @@ int snd_ymfpci_pcm_4ch(ymfpci_t *chip, int device, snd_pcm_t **rpcm);
 int snd_ymfpci_mixer(ymfpci_t *chip, int rear_switch);
 int snd_ymfpci_timer(ymfpci_t *chip, int device);
 
-int snd_ymfpci_voice_alloc(ymfpci_t *chip, ymfpci_voice_type_t type, int pair, ymfpci_voice_t **rvoice);
-int snd_ymfpci_voice_free(ymfpci_t *chip, ymfpci_voice_t *pvoice);
-
-#ifdef CONFIG_PM
-void snd_ymfpci_suspend(ymfpci_t *chip);
-void snd_ymfpci_resume(ymfpci_t *chip);
-#endif
-
 #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
 #define SUPPORT_JOYSTICK
 #endif