Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[sfrench/cifs-2.6.git] / include / sound / sb.h

diff --git a/include/sound/sb.h b/include/sound/sb.h
index d0c9ed3546c89d8d12687b413d2744daaad19334..85f93c5fe1e4030b297a1381819db5aafa82c235 100644 (file)
--- a/include/sound/sb.h
+++ b/include/sound/sb.h
@@ -240,11 +240,15 @@ struct snd_sb {
 #define SB_DT019X_CAP_MAIN     0x07
 
 #define SB_ALS4000_MONO_IO_CTRL        0x4b
+#define SB_ALS4000_OUT_MIXER_CTRL_2    0x4c
 #define SB_ALS4000_MIC_IN_GAIN 0x4d
+#define SB_ALS4000_ANALOG_REFRNC_VOLT_CTRL 0x4e
 #define SB_ALS4000_FMDAC       0x4f
 #define SB_ALS4000_3D_SND_FX   0x50
 #define SB_ALS4000_3D_TIME_DELAY       0x51
 #define SB_ALS4000_3D_AUTO_MUTE        0x52
+#define SB_ALS4000_ANALOG_BLOCK_CTRL 0x53
+#define SB_ALS4000_3D_DELAYLINE_PATTERN 0x54
 #define SB_ALS4000_QSOUND      0xdb
 
 /* IRQ setting bitmap */
@@ -257,6 +261,7 @@ struct snd_sb {
 #define SB_IRQTYPE_8BIT                0x01
 #define SB_IRQTYPE_16BIT       0x02
 #define SB_IRQTYPE_MPUIN       0x04
+#define ALS4K_IRQTYPE_CR1E_DMA 0x20
 
 /* DMA setting bitmap */
 #define SB_DMASETUP_DMA0       0x01