1 files changed, 4 insertions, 2 deletions

diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 67bf3f18e96a..8411c7ef6f11 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -48,7 +48,8 @@
 
 /* FIXME? - according to the OSS driver the EMU10K1 needs a 29 bit DMA mask */
 #define EMU10K1_DMA_MASK        0x7fffffffUL    /* 31bit */
-#define AUDIGY_DMA_MASK         0xffffffffUL    /* 32bit */
+#define AUDIGY_DMA_MASK         0x7fffffffUL    /* 31bit FIXME - 32 should work? */
+                                                /* See ALSA bug #1276 - rlrevell */
 
 #define TMEMSIZE        256*1024
 #define TMEMSIZEREG     4
@@ -1055,11 +1056,12 @@ typedef struct {
         unsigned char emu10k2_chip; /* Audigy 1 or Audigy 2. */
         unsigned char ca0102_chip;  /* Audigy 1 or Audigy 2. Not SB Audigy 2 Value. */
         unsigned char ca0108_chip;  /* Audigy 2 Value */
+        unsigned char ca_cardbus_chip; /* Audigy 2 ZS Notebook */
         unsigned char ca0151_chip;  /* P16V */
         unsigned char spk71;        /* Has 7.1 speakers */
         unsigned char sblive51;     /* SBLive! 5.1 - extout 0x11 -> center, 0x12 -> lfe */
         unsigned char spdif_bug;    /* Has Spdif phasing bug */
-        unsigned char ac97_chip;    /* Has an AC97 chip */
+        unsigned char ac97_chip;    /* Has an AC97 chip: 1 = mandatory, 2 = optional */
         unsigned char ecard;        /* APS EEPROM */
         const char *driver;
         const char *name;