diff options
author | Pavel Machek <pavel@suse.cz> | 2005-04-16 18:25:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:30 -0400 |
commit | e2d53566a757c8d12246d8daf8c5a2f21a0c4293 (patch) | |
tree | 647d7fa2a0e9230f1253a04efd07a3d01a7bf785 /sound/core | |
parent | e5378ca8c0ab684bd9339dc6827dd5a042f9e6fc (diff) |
[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 <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 3f1fa8eabb72..d72f58f450ce 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
@@ -744,7 +744,7 @@ struct snd_generic_device { | |||
744 | 744 | ||
745 | #define SND_GENERIC_NAME "snd_generic_pm" | 745 | #define SND_GENERIC_NAME "snd_generic_pm" |
746 | 746 | ||
747 | static int snd_generic_suspend(struct device *dev, u32 state, u32 level); | 747 | static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level); |
748 | static int snd_generic_resume(struct device *dev, u32 level); | 748 | static int snd_generic_resume(struct device *dev, u32 level); |
749 | 749 | ||
750 | static struct device_driver snd_generic_driver = { | 750 | static struct device_driver snd_generic_driver = { |
@@ -800,7 +800,7 @@ static void snd_generic_device_unregister(struct snd_generic_device *dev) | |||
800 | } | 800 | } |
801 | 801 | ||
802 | /* suspend/resume callbacks for snd_generic platform device */ | 802 | /* suspend/resume callbacks for snd_generic platform device */ |
803 | static int snd_generic_suspend(struct device *dev, u32 state, u32 level) | 803 | static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level) |
804 | { | 804 | { |
805 | snd_card_t *card; | 805 | snd_card_t *card; |
806 | 806 | ||