diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-30 12:12:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-30 12:12:27 +0100 |
| commit | 77d531bfdaec60001812047737c092727f076318 (patch) | |
| tree | e6cf09201af15aafd2dc4e53d76835ec69183fa7 /sound/pci/oxygen/oxygen_regs.h | |
| parent | cd262518a3ae4465e8e51c29641d98c4ed0651a1 (diff) | |
| parent | 3f49a66f6ceff1c87b49858644771c17763902ab (diff) | |
Merge branch 'xonar-dg' of git://git.alsa-project.org/alsa-kprivate into for-next
This completes the hardware support for the Asus Xonar DG/DGX cards,
and makes them actually usable.
This is v4 of Roman's patch set with some small formatting changes.
Diffstat (limited to 'sound/pci/oxygen/oxygen_regs.h')
| -rw-r--r-- | sound/pci/oxygen/oxygen_regs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen_regs.h b/sound/pci/oxygen/oxygen_regs.h index 63dc7a0ab555..8c191badaae8 100644 --- a/sound/pci/oxygen/oxygen_regs.h +++ b/sound/pci/oxygen/oxygen_regs.h @@ -318,6 +318,7 @@ #define OXYGEN_PLAY_MUTE23 0x0002 #define OXYGEN_PLAY_MUTE45 0x0004 #define OXYGEN_PLAY_MUTE67 0x0008 +#define OXYGEN_PLAY_MUTE_MASK 0x000f #define OXYGEN_PLAY_MULTICH_MASK 0x0010 #define OXYGEN_PLAY_MULTICH_I2S_DAC 0x0000 #define OXYGEN_PLAY_MULTICH_AC97 0x0010 |