vserver 2.0 rc7

[linux-2.6.git] / sound / pci / ali5451 / ali5451.c

diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index b58de44..984d5d4 100644 (file)
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -188,7 +188,7 @@ typedef struct snd_ali_channel_control {
 
 struct snd_ali_stru_voice {
        unsigned int number;
-       int use: 1,
+       unsigned int use: 1,
            pcm: 1,
            midi: 1,
            mode: 1,
@@ -199,7 +199,7 @@ struct snd_ali_stru_voice {
        snd_pcm_substream_t *substream;
        snd_ali_voice_t *extra;
        
-       int running: 1;
+       unsigned int running: 1;
 
        int eso;                /* final ESO value for channel */
        int count;              /* runtime->period_size */
@@ -1894,7 +1894,7 @@ static int __devinit snd_ali_mixer(ali_t * codec)
 }
 
 #ifdef CONFIG_PM
-static int ali_suspend(snd_card_t *card, unsigned int state)
+static int ali_suspend(snd_card_t *card, pm_message_t state)
 {
        ali_t *chip = card->pm_private_data;
        ali_image_t *im;
@@ -1936,7 +1936,7 @@ static int ali_suspend(snd_card_t *card, unsigned int state)
        return 0;
 }
 
-static int ali_resume(snd_card_t *card, unsigned int state)
+static int ali_resume(snd_card_t *card)
 {
        ali_t *chip = card->pm_private_data;
        ali_image_t *im;