From: Andrew Morton <akpm@osdl.org>

Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 sound/core/init.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN sound/core/init.c~get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks-sound-fix sound/core/init.c
--- devel/sound/core/init.c~get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks-sound-fix	2005-10-15 17:14:50.000000000 -0700
+++ devel-akpm/sound/core/init.c	2005-10-15 17:14:50.000000000 -0700
@@ -676,8 +676,8 @@ struct snd_generic_device {
 #define SND_GENERIC_NAME	"snd_generic"
 
 #ifdef CONFIG_PM
-static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level);
-static int snd_generic_resume(struct device *dev, u32 level);
+static int snd_generic_suspend(struct device *dev, pm_message_t state);
+static int snd_generic_resume(struct device *dev);
 #endif
 
 /* initialized in sound.c */
_