diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:13 +0100 |
| commit | fa15fdeffa3977b17882f485547e65296cf0bd30 (patch) | |
| tree | 79ef506dd09de46687598ee340e4d6f85494aa19 /include/sound | |
| parent | 843ad02fa4fb9230cd19923cc8ea1d6096cadf4e (diff) | |
| parent | 37ba1b62836d2440980cf553c49556393b05c6cd (diff) | |
| download | linux-fa15fdeffa3977b17882f485547e65296cf0bd30.tar.gz linux-fa15fdeffa3977b17882f485547e65296cf0bd30.tar.bz2 linux-fa15fdeffa3977b17882f485547e65296cf0bd30.zip | |
Merge branch 'topic/isa-misc' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/sb.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/sb.h b/include/sound/sb.h index 85f93c5fe1e4..4e62ee1e4115 100644 --- a/include/sound/sb.h +++ b/include/sound/sb.h @@ -249,6 +249,7 @@ struct snd_sb { #define SB_ALS4000_3D_AUTO_MUTE 0x52 #define SB_ALS4000_ANALOG_BLOCK_CTRL 0x53 #define SB_ALS4000_3D_DELAYLINE_PATTERN 0x54 +#define SB_ALS4000_CR3_CONFIGURATION 0xc3 /* bit 7 is Digital Loop Enable */ #define SB_ALS4000_QSOUND 0xdb /* IRQ setting bitmap */ @@ -330,7 +331,8 @@ enum { SB_MIX_DOUBLE, SB_MIX_INPUT_SW, SB_MIX_CAPTURE_PRO, - SB_MIX_CAPTURE_DT019X + SB_MIX_CAPTURE_DT019X, + SB_MIX_MONO_CAPTURE_ALS4K }; #define SB_MIXVAL_DOUBLE(left_reg, right_reg, left_shift, right_shift, mask) \ |