diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-01 08:27:25 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-01 08:27:25 (GMT) |
| commit | bc32134c0523c60989d2f2439e176601668a62a5 (patch) | |
| tree | 03f63fc387e78592968a1f04ee4e173ca32fec20 /sound/soc/blackfin/bf5xx-ac97-pcm.h | |
| parent | 1c6770a38a6652777b9d1592b66e0d8e7dfb6160 (diff) | |
| parent | 066624c6a1733a72a67f1d06d35a2153e7d9082b (diff) | |
| download | linux-fsl-qoriq-bc32134c0523c60989d2f2439e176601668a62a5.tar.xz | |
Merge branch 'for-next' into for-linus
Merge the whole changes for 3.11-rc1 merge
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ac97-pcm.h')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ac97-pcm.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.h b/sound/soc/blackfin/bf5xx-ac97-pcm.h deleted file mode 100644 index d324d58..0000000 --- a/sound/soc/blackfin/bf5xx-ac97-pcm.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * linux/sound/arm/bf5xx-ac97-pcm.h -- ALSA PCM interface for the Blackfin - * - * Copyright 2007 Analog Device Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef _BF5XX_AC97_PCM_H -#define _BF5XX_AC97_PCM_H - -struct bf5xx_pcm_dma_params { - char *name; /* stream identifier */ -}; - -struct bf5xx_gpio { - u32 sys; - u32 rx; - u32 tx; - u32 clk; - u32 frm; -}; - -#endif |