diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2014-09-22 10:12:16 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-22 10:12:16 +0200 |
| commit | 7639913f7298ed23a3f026ebcbb3b4e8850bcc39 (patch) | |
| tree | 26f08f061535015b748a96106f4869560e3afc63 /sound/pci/hda/ca0132_regs.h | |
| parent | ALSA: oxygen: set fifo_size (diff) | |
| parent | ALSA: hda - Use standard hda_jack infrastructure for CA0132 driver (diff) | |
| download | linux-dev-7639913f7298ed23a3f026ebcbb3b4e8850bcc39.tar.xz linux-dev-7639913f7298ed23a3f026ebcbb3b4e8850bcc39.zip | |
Merge branch 'topic/hda-jack-rework' into for-next
This is a merge of rework of HD-audio jack event handling code.
It extends the jack table to allow multiple callbacks.
Diffstat (limited to 'sound/pci/hda/ca0132_regs.h')
| -rw-r--r-- | sound/pci/hda/ca0132_regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/ca0132_regs.h b/sound/pci/hda/ca0132_regs.h index 07e760937d3c..8371274aa811 100644 --- a/sound/pci/hda/ca0132_regs.h +++ b/sound/pci/hda/ca0132_regs.h @@ -20,7 +20,7 @@ */ #ifndef __CA0132_REGS_H -#define __CA0312_REGS_H +#define __CA0132_REGS_H #define DSP_CHIP_OFFSET 0x100000 #define DSP_DBGCNTL_MODULE_OFFSET 0xE30 |