diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /sound/pci/ac97/ac97_patch.h | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'sound/pci/ac97/ac97_patch.h')
| -rw-r--r-- | sound/pci/ac97/ac97_patch.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/ac97/ac97_patch.h b/sound/pci/ac97/ac97_patch.h index 9cccc27ea1b5..47bf8dfe8276 100644 --- a/sound/pci/ac97/ac97_patch.h +++ b/sound/pci/ac97/ac97_patch.h | |||
| @@ -83,8 +83,10 @@ static int snd_ac97_swap_ctl(struct snd_ac97 *ac97, const char *s1, | |||
| 83 | const char *s2, const char *suffix); | 83 | const char *s2, const char *suffix); |
| 84 | static void snd_ac97_rename_vol_ctl(struct snd_ac97 *ac97, const char *src, | 84 | static void snd_ac97_rename_vol_ctl(struct snd_ac97 *ac97, const char *src, |
| 85 | const char *dst); | 85 | const char *dst); |
| 86 | #ifdef CONFIG_PM | ||
| 86 | static void snd_ac97_restore_status(struct snd_ac97 *ac97); | 87 | static void snd_ac97_restore_status(struct snd_ac97 *ac97); |
| 87 | static void snd_ac97_restore_iec958(struct snd_ac97 *ac97); | 88 | static void snd_ac97_restore_iec958(struct snd_ac97 *ac97); |
| 89 | #endif | ||
| 88 | static int snd_ac97_info_enum_double(struct snd_kcontrol *kcontrol, | 90 | static int snd_ac97_info_enum_double(struct snd_kcontrol *kcontrol, |
| 89 | struct snd_ctl_elem_info *uinfo); | 91 | struct snd_ctl_elem_info *uinfo); |
| 90 | static int snd_ac97_get_enum_double(struct snd_kcontrol *kcontrol, | 92 | static int snd_ac97_get_enum_double(struct snd_kcontrol *kcontrol, |