diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-31 13:53:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-31 13:53:43 +0200 |
| commit | 7bee946358c3cb957d4aa648fc5ab3cad0b232d0 (patch) | |
| tree | 693061ebde2abc35ecc846e5084630d7225aaaff /sound/soc/sh/hac.c | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'linus' into locking-for-linus
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'sound/soc/sh/hac.c')
| -rw-r--r-- | sound/soc/sh/hac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index eab31838bad..41db75af3c6 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c @@ -267,6 +267,10 @@ static int hac_hw_params(struct snd_pcm_substream *substream, #define AC97_FMTS \ SNDRV_PCM_FMTBIT_S16_LE +static struct snd_soc_dai_ops hac_dai_ops = { + .hw_params = hac_hw_params, +}; + struct snd_soc_dai sh4_hac_dai[] = { { .name = "HAC0", @@ -284,9 +288,7 @@ struct snd_soc_dai sh4_hac_dai[] = { .channels_min = 2, .channels_max = 2, }, - .ops = { - .hw_params = hac_hw_params, - }, + .ops = &hac_dai_ops, }, #ifdef CONFIG_CPU_SUBTYPE_SH7760 { @@ -305,9 +307,7 @@ struct snd_soc_dai sh4_hac_dai[] = { .channels_min = 2, .channels_max = 2, }, - .ops = { - .hw_params = hac_hw_params, - }, + .ops = &hac_dai_ops, }, #endif |