Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / sound / isa / sb / sb_mixer.c

diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c
index 490b1ca5cf5882c3cff630dca4f637697e32117c..91d14224f6b332de1119d89bc07bff76c00f37cc 100644 (file)
--- a/sound/isa/sb/sb_mixer.c
+++ b/sound/isa/sb/sb_mixer.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for Sound Blaster mixer control
  *
  *
@@ -19,7 +19,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/time.h>
@@ -821,6 +820,7 @@ int snd_sbmixer_new(struct snd_sb *chip)
                break;
        case SB_HW_16:
        case SB_HW_ALS100:
+       case SB_HW_CS5530:
                if ((err = snd_sbmixer_init(chip,
                                            snd_sb16_controls,
                                            ARRAY_SIZE(snd_sb16_controls),
@@ -950,6 +950,7 @@ void snd_sbmixer_suspend(struct snd_sb *chip)
                break;
        case SB_HW_16:
        case SB_HW_ALS100:
+       case SB_HW_CS5530:
                save_mixer(chip, sb16_saved_regs, ARRAY_SIZE(sb16_saved_regs));
                break;
        case SB_HW_ALS4000:
@@ -975,6 +976,7 @@ void snd_sbmixer_resume(struct snd_sb *chip)
                break;
        case SB_HW_16:
        case SB_HW_ALS100:
+       case SB_HW_CS5530:
                restore_mixer(chip, sb16_saved_regs, ARRAY_SIZE(sb16_saved_regs));
                break;
        case SB_HW_ALS4000: