diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:01 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:01 +0200 |
| commit | e71981343ad29b5d929f82ac56c0b27b8ea0e540 (patch) | |
| tree | 47135be4252faecbc0e5508658a58f8afd197fff /sound/soc/fsl | |
| parent | 2603798070a80d76e7e6d2992ba4ec74addcec90 (diff) | |
| parent | bda7d2a862e6b788bca2d02d38a07966a9c92e48 (diff) | |
| download | op-kernel-dev-e71981343ad29b5d929f82ac56c0b27b8ea0e540.zip op-kernel-dev-e71981343ad29b5d929f82ac56c0b27b8ea0e540.tar.gz | |
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 4f455bd..676841c 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c @@ -16,7 +16,6 @@ #include <asm/mpc52xx_psc.h> -#include "mpc5200_psc_i2s.h" #include "mpc5200_dma.h" /** diff --git a/sound/soc/fsl/mpc5200_psc_i2s.h b/sound/soc/fsl/mpc5200_psc_i2s.h deleted file mode 100644 index ce55e07..0000000 --- a/sound/soc/fsl/mpc5200_psc_i2s.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Freescale MPC5200 PSC in I2S mode - * ALSA SoC Digital Audio Interface (DAI) driver - * - */ - -#ifndef __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__ -#define __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__ - -extern struct snd_soc_dai psc_i2s_dai[]; - -#endif /* __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__ */ |
