diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-16 00:29:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-16 00:29:07 +0200 |
| commit | 82638844d9a8581bbf33201cc209a14876eca167 (patch) | |
| tree | 961d7f9360194421a71aa644a9d0c176a960ce49 /sound/soc/codecs/ac97.h | |
| parent | Revert "cpumask: introduce new APIs" (diff) | |
| parent | generic ipi function calls: wait on alloc failure fallback (diff) | |
| download | linux-82638844d9a8581bbf33201cc209a14876eca167.tar.xz linux-82638844d9a8581bbf33201cc209a14876eca167.zip | |
Merge branch 'linus' into cpus4096
Conflicts:
arch/x86/xen/smp.c
kernel/sched_rt.c
net/iucv/iucv.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/soc/codecs/ac97.h')
| -rw-r--r-- | sound/soc/codecs/ac97.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ac97.h b/sound/soc/codecs/ac97.h index 2bf6d69fd069..281aa42e2bbb 100644 --- a/sound/soc/codecs/ac97.h +++ b/sound/soc/codecs/ac97.h @@ -14,6 +14,6 @@ #define __LINUX_SND_SOC_AC97_H extern struct snd_soc_codec_device soc_codec_dev_ac97; -extern struct snd_soc_codec_dai ac97_dai; +extern struct snd_soc_dai ac97_dai; #endif |