diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-13 17:43:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-13 17:43:51 -0800 |
| commit | 576dd6f68067742479b5c083cb795fbdc57e5d1b (patch) | |
| tree | 4a2d0dbc26884e444d1e0488f02e7b16f068e66d /include | |
| parent | 633d7b7e85cd6345a3e6ba76f177f508e0662773 (diff) | |
| parent | 872b8f8160b859c410c804843eea5c8b35e8ff8c (diff) | |
| download | history-576dd6f68067742479b5c083cb795fbdc57e5d1b.tar.gz | |
Merge http://linux-sound.bkbits.net/linux-sound
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/ac97_codec.h | 1 | ||||
| -rw-r--r-- | include/sound/version.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index f2eabca88f3039..d421d964cf634a 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -426,6 +426,7 @@ struct snd_ac97_build_ops { int (*build_spdif) (ac97_t *ac97); int (*build_post_spdif) (ac97_t *ac97); #ifdef CONFIG_PM + void (*suspend) (ac97_t *ac97); void (*resume) (ac97_t *ac97); #endif }; diff --git a/include/sound/version.h b/include/sound/version.h index 37d587f79e6b5a..a4db7e75de4d37 100644 --- a/include/sound/version.h +++ b/include/sound/version.h @@ -1,3 +1,3 @@ /* include/version.h. Generated by configure. */ -#define CONFIG_SND_VERSION "1.0.8rc2" -#define CONFIG_SND_DATE " (Wed Jan 05 06:44:40 2005 UTC)" +#define CONFIG_SND_VERSION "1.0.8" +#define CONFIG_SND_DATE " (Thu Jan 13 09:39:32 2005 UTC)" |