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/blackfin/bf5xx-ac97.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/blackfin/bf5xx-ac97.h')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ac97.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97.h b/sound/soc/blackfin/bf5xx-ac97.h index a1f97dd809d6..15c635e33f4d 100644 --- a/sound/soc/blackfin/bf5xx-ac97.h +++ b/sound/soc/blackfin/bf5xx-ac97.h | |||
| @@ -50,8 +50,6 @@ struct ac97_frame { | |||
| 50 | #define TAG_PCM_SR 0x0080 | 50 | #define TAG_PCM_SR 0x0080 |
| 51 | #define TAG_PCM_LFE 0x0040 | 51 | #define TAG_PCM_LFE 0x0040 |
| 52 | 52 | ||
| 53 | extern struct snd_soc_dai bfin_ac97_dai; | ||
| 54 | |||
| 55 | void bf5xx_pcm_to_ac97(struct ac97_frame *dst, const __u16 *src, \ | 53 | void bf5xx_pcm_to_ac97(struct ac97_frame *dst, const __u16 *src, \ |
| 56 | size_t count, unsigned int chan_mask); | 54 | size_t count, unsigned int chan_mask); |
| 57 | 55 | ||