diff options
-rw-r--r-- | include/asm-arm/arch-omap/omap-alsa.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-arm/arch-omap/omap-alsa.h b/include/asm-arm/arch-omap/omap-alsa.h index df4695474e3d..fcaf44c14714 100644 --- a/include/asm-arm/arch-omap/omap-alsa.h +++ b/include/asm-arm/arch-omap/omap-alsa.h | |||
@@ -65,7 +65,7 @@ struct audio_stream { | |||
65 | int period; /* current transfer period */ | 65 | int period; /* current transfer period */ |
66 | int periods; /* current count of periods registerd in the DMA engine */ | 66 | int periods; /* current count of periods registerd in the DMA engine */ |
67 | spinlock_t dma_lock; /* for locking in DMA operations */ | 67 | spinlock_t dma_lock; /* for locking in DMA operations */ |
68 | snd_pcm_substream_t *stream; /* the pcm stream */ | 68 | struct snd_pcm_substream *stream; /* the pcm stream */ |
69 | unsigned linked:1; /* dma channels linked */ | 69 | unsigned linked:1; /* dma channels linked */ |
70 | int offset; /* store start position of the last period in the alsa buffer */ | 70 | int offset; /* store start position of the last period in the alsa buffer */ |
71 | int (*hw_start)(void); /* interface to start HW interface, e.g. McBSP */ | 71 | int (*hw_start)(void); /* interface to start HW interface, e.g. McBSP */ |
@@ -76,8 +76,8 @@ struct audio_stream { | |||
76 | * Alsa card structure for aic23 | 76 | * Alsa card structure for aic23 |
77 | */ | 77 | */ |
78 | struct snd_card_omap_codec { | 78 | struct snd_card_omap_codec { |
79 | snd_card_t *card; | 79 | struct snd_card *card; |
80 | snd_pcm_t *pcm; | 80 | struct snd_pcm *pcm; |
81 | long samplerate; | 81 | long samplerate; |
82 | struct audio_stream s[2]; /* playback & capture */ | 82 | struct audio_stream s[2]; /* playback & capture */ |
83 | }; | 83 | }; |
@@ -89,9 +89,9 @@ struct snd_card_omap_codec { | |||
89 | struct omap_alsa_codec_config { | 89 | struct omap_alsa_codec_config { |
90 | char *name; | 90 | char *name; |
91 | struct omap_mcbsp_reg_cfg *mcbsp_regs_alsa; | 91 | struct omap_mcbsp_reg_cfg *mcbsp_regs_alsa; |
92 | snd_pcm_hw_constraint_list_t *hw_constraints_rates; | 92 | struct snd_pcm_hw_constraint_list *hw_constraints_rates; |
93 | snd_pcm_hardware_t *snd_omap_alsa_playback; | 93 | struct snd_pcm_hardware *snd_omap_alsa_playback; |
94 | snd_pcm_hardware_t *snd_omap_alsa_capture; | 94 | struct snd_pcm_hardware *snd_omap_alsa_capture; |
95 | void (*codec_configure_dev)(void); | 95 | void (*codec_configure_dev)(void); |
96 | void (*codec_set_samplerate)(long); | 96 | void (*codec_set_samplerate)(long); |
97 | void (*codec_clock_setup)(void); | 97 | void (*codec_clock_setup)(void); |