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/ep93xx/ep93xx-pcm.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/ep93xx/ep93xx-pcm.h')
| -rw-r--r-- | sound/soc/ep93xx/ep93xx-pcm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/ep93xx/ep93xx-pcm.h b/sound/soc/ep93xx/ep93xx-pcm.h index 4ffdd3f62fe9..111e1121ecb8 100644 --- a/sound/soc/ep93xx/ep93xx-pcm.h +++ b/sound/soc/ep93xx/ep93xx-pcm.h | |||
| @@ -17,6 +17,4 @@ struct ep93xx_pcm_dma_params { | |||
| 17 | int dma_port; | 17 | int dma_port; |
| 18 | }; | 18 | }; |
| 19 | 19 | ||
| 20 | extern struct snd_soc_platform ep93xx_soc_platform; | ||
| 21 | |||
| 22 | #endif /* _EP93XX_SND_SOC_PCM_H */ | 20 | #endif /* _EP93XX_SND_SOC_PCM_H */ |