From e2d53566a757c8d12246d8daf8c5a2f21a0c4293 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 16 Apr 2005 15:25:30 -0700 Subject: [PATCH] fix pm_message_t vs. u32 in alsa I thought I'm done with fixing u32 vs. pm_message_t ... unfortunately that turned out not to be the case as Russel King pointed out. This fixes last few bits in alsa. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- sound/core/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sound/core/init.c') diff --git a/sound/core/init.c b/sound/core/init.c index 3f1fa8e..d72f58f 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -744,7 +744,7 @@ struct snd_generic_device { #define SND_GENERIC_NAME "snd_generic_pm" -static int snd_generic_suspend(struct device *dev, u32 state, u32 level); +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 struct device_driver snd_generic_driver = { @@ -800,7 +800,7 @@ static void snd_generic_device_unregister(struct snd_generic_device *dev) } /* suspend/resume callbacks for snd_generic platform device */ -static int snd_generic_suspend(struct device *dev, u32 state, u32 level) +static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level) { snd_card_t *card; -- cgit v1.1