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/atmel/atmel-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/atmel/atmel-pcm.h')
| -rw-r--r-- | sound/soc/atmel/atmel-pcm.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/atmel/atmel-pcm.h b/sound/soc/atmel/atmel-pcm.h index ec9b2824b663..2597329302e7 100644 --- a/sound/soc/atmel/atmel-pcm.h +++ b/sound/soc/atmel/atmel-pcm.h | |||
| @@ -74,9 +74,6 @@ struct atmel_pcm_dma_params { | |||
| 74 | void (*dma_intr_handler)(u32, struct snd_pcm_substream *); | 74 | void (*dma_intr_handler)(u32, struct snd_pcm_substream *); |
| 75 | }; | 75 | }; |
| 76 | 76 | ||
| 77 | extern struct snd_soc_platform atmel_soc_platform; | ||
| 78 | |||
| 79 | |||
| 80 | /* | 77 | /* |
| 81 | * SSC register access (since ssc_writel() / ssc_readl() require literal name) | 78 | * SSC register access (since ssc_writel() / ssc_readl() require literal name) |
| 82 | */ | 79 | */ |