diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-27 12:52:29 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-27 12:52:29 +0100 |
commit | d5432503bfb49f3425bad0b850714ffd8b533cfc (patch) | |
tree | 97926e7eea0b6d8b0e8bf98748dd9c0ef4c718ad /sound/soc/s6000/s6000-pcm.h | |
parent | 6a98e34b58919c52e8c8beec991759999af342da (diff) | |
parent | c0d018bd5b1aabad59dffdec568e189359d93a14 (diff) | |
download | blackbird-op-linux-d5432503bfb49f3425bad0b850714ffd8b533cfc.tar.gz blackbird-op-linux-d5432503bfb49f3425bad0b850714ffd8b533cfc.zip |
Merge tag 'asoc-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.18
A few small driver fixes for v3.18 plus the removal of the s6000 support
since the relevant chip is no longer supported in mainline.
Diffstat (limited to 'sound/soc/s6000/s6000-pcm.h')
-rw-r--r-- | sound/soc/s6000/s6000-pcm.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/sound/soc/s6000/s6000-pcm.h b/sound/soc/s6000/s6000-pcm.h deleted file mode 100644 index 09d9b883e58b..000000000000 --- a/sound/soc/s6000/s6000-pcm.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * ALSA PCM interface for the Stretch s6000 family - * - * Author: Daniel Gloeckner, <dg@emlix.com> - * Copyright: (C) 2009 emlix GmbH <info@emlix.com> - * - * 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 _S6000_PCM_H -#define _S6000_PCM_H - -struct snd_soc_dai; -struct snd_pcm_substream; - -struct s6000_pcm_dma_params { - unsigned int (*check_xrun)(struct snd_soc_dai *cpu_dai); - int (*trigger)(struct snd_pcm_substream *substream, int cmd, int after); - dma_addr_t sif_in; - dma_addr_t sif_out; - u32 dma_in; - u32 dma_out; - int irq; - int same_rate; - - spinlock_t lock; - int in_use; - int rate; -}; - -#endif |