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_ssc_dai.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_ssc_dai.h')
| -rw-r--r-- | sound/soc/atmel/atmel_ssc_dai.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/atmel/atmel_ssc_dai.h b/sound/soc/atmel/atmel_ssc_dai.h index 391135f9c6c1..5d4f0f9b4d9a 100644 --- a/sound/soc/atmel/atmel_ssc_dai.h +++ b/sound/soc/atmel/atmel_ssc_dai.h | |||
| @@ -116,6 +116,7 @@ struct atmel_ssc_info { | |||
| 116 | struct atmel_pcm_dma_params *dma_params[2]; | 116 | struct atmel_pcm_dma_params *dma_params[2]; |
| 117 | struct atmel_ssc_state ssc_state; | 117 | struct atmel_ssc_state ssc_state; |
| 118 | }; | 118 | }; |
| 119 | extern struct snd_soc_dai atmel_ssc_dai[]; | 119 | |
| 120 | int atmel_ssc_set_audio(int ssc); | ||
| 120 | 121 | ||
| 121 | #endif /* _AT91_SSC_DAI_H */ | 122 | #endif /* _AT91_SSC_DAI_H */ |