diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 05:17:01 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 05:17:01 -0400 |
| commit | e71981343ad29b5d929f82ac56c0b27b8ea0e540 (patch) | |
| tree | 47135be4252faecbc0e5508658a58f8afd197fff /sound/soc/fsl | |
| parent | 2603798070a80d76e7e6d2992ba4ec74addcec90 (diff) | |
| parent | bda7d2a862e6b788bca2d02d38a07966a9c92e48 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/mpc5200_psc_i2s.c | 1 | ||||
| -rw-r--r-- | sound/soc/fsl/mpc5200_psc_i2s.h | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index 4f455bd6851f..676841cbae98 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #include <asm/mpc52xx_psc.h> | 17 | #include <asm/mpc52xx_psc.h> |
| 18 | 18 | ||
| 19 | #include "mpc5200_psc_i2s.h" | ||
| 20 | #include "mpc5200_dma.h" | 19 | #include "mpc5200_dma.h" |
| 21 | 20 | ||
| 22 | /** | 21 | /** |
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.h b/sound/soc/fsl/mpc5200_psc_i2s.h deleted file mode 100644 index ce55e070fdf3..000000000000 --- a/sound/soc/fsl/mpc5200_psc_i2s.h +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Freescale MPC5200 PSC in I2S mode | ||
| 3 | * ALSA SoC Digital Audio Interface (DAI) driver | ||
| 4 | * | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifndef __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__ | ||
| 8 | #define __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__ | ||
| 9 | |||
| 10 | extern struct snd_soc_dai psc_i2s_dai[]; | ||
| 11 | |||
| 12 | #endif /* __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__ */ | ||