git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
sound
/
isa
/
ad1848
/
ad1848_lib.c
diff --git
a/sound/isa/ad1848/ad1848_lib.c
b/sound/isa/ad1848/ad1848_lib.c
index
97b8f87
..
8fb3db1
100644
(file)
--- a/
sound/isa/ad1848/ad1848_lib.c
+++ b/
sound/isa/ad1848/ad1848_lib.c
@@
-644,7
+644,7
@@
static void snd_ad1848_thinkpad_twiddle(ad1848_t *chip, int on) {
}
#ifdef CONFIG_PM
}
#ifdef CONFIG_PM
-static int snd_ad1848_suspend(snd_card_t *card,
unsigned in
t state)
+static int snd_ad1848_suspend(snd_card_t *card,
pm_message_
t state)
{
ad1848_t *chip = card->pm_private_data;
{
ad1848_t *chip = card->pm_private_data;
@@
-657,7
+657,7
@@
static int snd_ad1848_suspend(snd_card_t *card, unsigned int state)
return 0;
}
return 0;
}
-static int snd_ad1848_resume(snd_card_t *card
, unsigned int state
)
+static int snd_ad1848_resume(snd_card_t *card)
{
ad1848_t *chip = card->pm_private_data;
{
ad1848_t *chip = card->pm_private_data;