Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc

[pandora-kernel.git] / sound / pcmcia / vx / vxpocket.h

diff --git a/sound/pcmcia/vx/vxpocket.h b/sound/pcmcia/vx/vxpocket.h
index 70754aa..27ea002 100644 (file)
--- a/sound/pcmcia/vx/vxpocket.h
+++ b/sound/pcmcia/vx/vxpocket.h
@@ -30,7 +30,7 @@
 
 struct snd_vxpocket {
 
-       vx_core_t core;
+       struct vx_core core;
 
        unsigned long port;
 
@@ -42,16 +42,16 @@ struct snd_vxpocket {
        int index;      /* card index */
 
        /* pcmcia stuff */
-       dev_link_t link;
+       struct pcmcia_device    *p_dev;
        dev_node_t node;
 };
 
 extern struct snd_vx_ops snd_vxpocket_ops;
 
-void vx_set_mic_boost(vx_core_t *chip, int boost);
-void vx_set_mic_level(vx_core_t *chip, int level);
+void vx_set_mic_boost(struct vx_core *chip, int boost);
+void vx_set_mic_level(struct vx_core *chip, int level);
 
-int vxp_add_mic_controls(vx_core_t *chip);
+int vxp_add_mic_controls(struct vx_core *chip);
 
 /* Constants used to access the CDSP register (0x08). */
 #define CDSP_MAGIC     0xA7    /* magic value (for read) */