diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:49 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:49 +0100 |
commit | 12c2a682b55a40f2a986e36d6632110029bc63a5 (patch) | |
tree | ba21f049e4859411f6c135d597dc26260963ce7c /sound/pci/oxygen/xonar.h | |
parent | a86ba28583987b85845ed61be5f12aafb5fc4971 (diff) | |
parent | aefbd3e823d4fe219bb6420b0cac505847270507 (diff) |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/oxygen/xonar.h')
-rw-r--r-- | sound/pci/oxygen/xonar.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/oxygen/xonar.h b/sound/pci/oxygen/xonar.h index 89b3ed814d6..b35343b0a9a 100644 --- a/sound/pci/oxygen/xonar.h +++ b/sound/pci/oxygen/xonar.h @@ -35,6 +35,8 @@ int get_xonar_pcm179x_model(struct oxygen *chip, const struct pci_device_id *id); int get_xonar_cs43xx_model(struct oxygen *chip, const struct pci_device_id *id); +int get_xonar_wm87x6_model(struct oxygen *chip, + const struct pci_device_id *id); /* HDMI helper functions */ |