diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-06-28 13:36:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-06-28 13:36:22 +0200 |
| commit | accaf69da1d1e64bd77ac0caad77e4cfc3b654c7 (patch) | |
| tree | 0402e4fad9cecd428c8c3c228a08f9e31eb63470 /include/sound | |
| parent | 975cc02a904ae385721f1bdb65eb1bcf707dfaf1 (diff) | |
| parent | 27516080b21cbcb936440d2a3171867860b9a881 (diff) | |
| download | op-kernel-dev-accaf69da1d1e64bd77ac0caad77e4cfc3b654c7.zip op-kernel-dev-accaf69da1d1e64bd77ac0caad77e4cfc3b654c7.tar.gz | |
Merge tag 'asoc-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.11
Some more fixes and enhancements, and also a bunch of refectoring for
AC'97 support which enables more than one AC'97 controller driver to be
built in.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 85c1522..6eabee7 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -340,7 +340,7 @@ struct snd_soc_jack_gpio; typedef int (*hw_write_t)(void *,const char* ,int); -extern struct snd_ac97_bus_ops soc_ac97_ops; +extern struct snd_ac97_bus_ops *soc_ac97_ops; enum snd_soc_control_type { SND_SOC_I2C = 1, @@ -467,6 +467,8 @@ int snd_soc_new_ac97_codec(struct snd_soc_codec *codec, struct snd_ac97_bus_ops *ops, int num); void snd_soc_free_ac97_codec(struct snd_soc_codec *codec); +int snd_soc_set_ac97_ops(struct snd_ac97_bus_ops *ops); + /* *Controls */ |
