diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-21 14:51:35 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-21 14:51:35 +0400 |
| commit | 382e6a859e6622de0aa62c01976ae8ebd90e986d (patch) | |
| tree | 2501c554c231c5d0fcda7ff2e6e055bf23134d6f /sound/pci/oxygen/xonar_dg.c | |
| parent | 6de15b2a9330aeb5df9b66545f67c6c6ad2c045a (diff) | |
| parent | 97f8d3b6503082416898f893a442a78f8819c42a (diff) | |
| download | linux-382e6a859e6622de0aa62c01976ae8ebd90e986d.tar.xz | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/oxygen/xonar_dg.c')
| -rw-r--r-- | sound/pci/oxygen/xonar_dg.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/oxygen/xonar_dg.c b/sound/pci/oxygen/xonar_dg.c index 793bdf03d7e0..77acd790ea47 100644 --- a/sound/pci/oxygen/xonar_dg.c +++ b/sound/pci/oxygen/xonar_dg.c @@ -1,5 +1,5 @@ /* - * card driver for the Xonar DG + * card driver for the Xonar DG/DGX * * Copyright (c) Clemens Ladisch <clemens@ladisch.de> * @@ -17,8 +17,8 @@ */ /* - * Xonar DG - * -------- + * Xonar DG/DGX + * ------------ * * CMI8788: * @@ -581,7 +581,6 @@ static void dump_cs4245_registers(struct oxygen *chip, } struct oxygen_model model_xonar_dg = { - .shortname = "Xonar DG", .longname = "C-Media Oxygen HD Audio", .chip = "CMI8786", .init = dg_init, |