diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:19 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:19 +0100 |
| commit | 7df4f694356a125e4553ca35b215fd9e88e858c5 (patch) | |
| tree | b153e8aeb6439c3f7bc150ad9e6e3ff9d57849a0 /sound/pci/pcxhr/pcxhr.h | |
| parent | b54fc8dd2c43888f2754505cca2b6e88604a8ffa (diff) | |
| parent | d563ffa6b319a4e401d096db9014a947590ca081 (diff) | |
Merge branch 'topic/pcxhr' into for-linus
Diffstat (limited to 'sound/pci/pcxhr/pcxhr.h')
| -rw-r--r-- | sound/pci/pcxhr/pcxhr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/pcxhr/pcxhr.h b/sound/pci/pcxhr/pcxhr.h index 69d87dee699..bda776c4988 100644 --- a/sound/pci/pcxhr/pcxhr.h +++ b/sound/pci/pcxhr/pcxhr.h @@ -27,8 +27,8 @@ #include <linux/mutex.h> #include <sound/pcm.h> -#define PCXHR_DRIVER_VERSION 0x000905 /* 0.9.5 */ -#define PCXHR_DRIVER_VERSION_STRING "0.9.5" /* 0.9.5 */ +#define PCXHR_DRIVER_VERSION 0x000906 /* 0.9.6 */ +#define PCXHR_DRIVER_VERSION_STRING "0.9.6" /* 0.9.6 */ #define PCXHR_MAX_CARDS 6 @@ -124,6 +124,7 @@ struct pcxhr_mgr { unsigned char xlx_cfg; /* copy of PCXHR_XLX_CFG register */ unsigned char xlx_selmic; /* copy of PCXHR_XLX_SELMIC register */ + unsigned char dsp_reset; /* copy of PCXHR_DSP_RESET register */ }; |