diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/soc/fsl/mpc5200_dma.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/soc/fsl/mpc5200_dma.h')
| -rw-r--r-- | sound/soc/fsl/mpc5200_dma.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/fsl/mpc5200_dma.h b/sound/soc/fsl/mpc5200_dma.h index ca99586f2ad9..a3c0cd5382fb 100644 --- a/sound/soc/fsl/mpc5200_dma.h +++ b/sound/soc/fsl/mpc5200_dma.h | |||
| @@ -81,9 +81,4 @@ to_psc_dma_stream(struct snd_pcm_substream *substream, struct psc_dma *psc_dma) | |||
| 81 | return &psc_dma->playback; | 81 | return &psc_dma->playback; |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | int mpc5200_audio_dma_create(struct platform_device *op); | ||
| 85 | int mpc5200_audio_dma_destroy(struct platform_device *op); | ||
| 86 | |||
| 87 | extern struct snd_soc_platform mpc5200_audio_dma_platform; | ||
| 88 | |||
| 89 | #endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */ | 84 | #endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */ |