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/jz4740/jz4740-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/jz4740/jz4740-pcm.h')
| -rw-r--r-- | sound/soc/jz4740/jz4740-pcm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/jz4740/jz4740-pcm.h b/sound/soc/jz4740/jz4740-pcm.h index e3f221e2779c..1220cbb4382c 100644 --- a/sound/soc/jz4740/jz4740-pcm.h +++ b/sound/soc/jz4740/jz4740-pcm.h | |||
| @@ -11,8 +11,6 @@ | |||
| 11 | #include <linux/dma-mapping.h> | 11 | #include <linux/dma-mapping.h> |
| 12 | #include <asm/mach-jz4740/dma.h> | 12 | #include <asm/mach-jz4740/dma.h> |
| 13 | 13 | ||
| 14 | /* platform data */ | ||
| 15 | extern struct snd_soc_platform jz4740_soc_platform; | ||
| 16 | 14 | ||
| 17 | struct jz4740_pcm_config { | 15 | struct jz4740_pcm_config { |
| 18 | struct jz4740_dma_config dma_config; | 16 | struct jz4740_dma_config dma_config; |