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/fsl/mpc5200_psc_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/fsl/mpc5200_psc_ac97.h')
| -rw-r--r-- | sound/soc/fsl/mpc5200_psc_ac97.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.h b/sound/soc/fsl/mpc5200_psc_ac97.h index 4bc18c35c369..e881e784b270 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.h +++ b/sound/soc/fsl/mpc5200_psc_ac97.h | |||
| @@ -7,8 +7,6 @@ | |||
| 7 | #ifndef __SOUND_SOC_FSL_MPC52xx_PSC_AC97_H__ | 7 | #ifndef __SOUND_SOC_FSL_MPC52xx_PSC_AC97_H__ |
| 8 | #define __SOUND_SOC_FSL_MPC52xx_PSC_AC97_H__ | 8 | #define __SOUND_SOC_FSL_MPC52xx_PSC_AC97_H__ |
| 9 | 9 | ||
| 10 | extern struct snd_soc_dai psc_ac97_dai[]; | ||
| 11 | |||
| 12 | #define MPC5200_AC97_NORMAL 0 | 10 | #define MPC5200_AC97_NORMAL 0 |
| 13 | #define MPC5200_AC97_SPDIF 1 | 11 | #define MPC5200_AC97_SPDIF 1 |
| 14 | 12 | ||