diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-05-30 09:35:38 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2011-07-22 15:46:51 +0200 |
| commit | 7609c852cdc019d0b90176e4d5c770d1525fe5fd (patch) | |
| tree | a5e08bfa601efc686500aef66897dc54ab805ffa /include | |
| parent | bcb8e064ae734f8329eeb763d5c7d14cc8abd22d (diff) | |
sound: soc: ux500: Fix merge problems
Fix merge problems introduced in soc u8500 driver
when merging from main dev track
ST-Ericsson Linux next: 342252
ST-Ericsson ID: 342253
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Change-Id: I083638dddc34792b654d36b5aa967238614799c7
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24724
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/ux500_ab8500.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/sound/ux500_ab8500.h b/include/sound/ux500_ab8500.h index ff114d82d9e..7858bfdb4fa 100644 --- a/include/sound/ux500_ab8500.h +++ b/include/sound/ux500_ab8500.h @@ -16,12 +16,20 @@ extern struct snd_soc_ops ux500_ab8500_ops[]; -int ux500_ab8500_machine_codec_init(struct snd_soc_pcm_runtime *runtime); +struct snd_soc_pcm_runtime; + +int ux500_ab8500_startup(struct snd_pcm_substream *substream); + +void ux500_ab8500_shutdown(struct snd_pcm_substream *substream); + +int ux500_ab8500_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params); + +int ux500_ab8500_soc_machine_drv_init(void); void ux500_ab8500_soc_machine_drv_cleanup(void); -int enable_regulator(const char *name); -void disable_regulator(const char *name); +int ux500_ab8500_machine_codec_init(struct snd_soc_pcm_runtime *runtime); extern void ux500_ab8500_jack_report(int); |