diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /sound/pci | |
| parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
| parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/intel8x0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 40b181bab930..9f3b01bb72c8 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
| @@ -95,13 +95,13 @@ module_param(ac97_quirk, charp, 0444); | |||
| 95 | MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware."); | 95 | MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware."); |
| 96 | module_param(buggy_semaphore, bool, 0444); | 96 | module_param(buggy_semaphore, bool, 0444); |
| 97 | MODULE_PARM_DESC(buggy_semaphore, "Enable workaround for hardwares with problematic codec semaphores."); | 97 | MODULE_PARM_DESC(buggy_semaphore, "Enable workaround for hardwares with problematic codec semaphores."); |
| 98 | module_param(buggy_irq, bool, 0444); | 98 | module_param(buggy_irq, bint, 0444); |
| 99 | MODULE_PARM_DESC(buggy_irq, "Enable workaround for buggy interrupts on some motherboards."); | 99 | MODULE_PARM_DESC(buggy_irq, "Enable workaround for buggy interrupts on some motherboards."); |
| 100 | module_param(xbox, bool, 0444); | 100 | module_param(xbox, bool, 0444); |
| 101 | MODULE_PARM_DESC(xbox, "Set to 1 for Xbox, if you have problems with the AC'97 codec detection."); | 101 | MODULE_PARM_DESC(xbox, "Set to 1 for Xbox, if you have problems with the AC'97 codec detection."); |
| 102 | module_param(spdif_aclink, int, 0444); | 102 | module_param(spdif_aclink, int, 0444); |
| 103 | MODULE_PARM_DESC(spdif_aclink, "S/PDIF over AC-link."); | 103 | MODULE_PARM_DESC(spdif_aclink, "S/PDIF over AC-link."); |
| 104 | module_param(inside_vm, bool, 0444); | 104 | module_param(inside_vm, bint, 0444); |
| 105 | MODULE_PARM_DESC(inside_vm, "KVM/Parallels optimization."); | 105 | MODULE_PARM_DESC(inside_vm, "KVM/Parallels optimization."); |
| 106 | 106 | ||
| 107 | /* just for backward compatibility */ | 107 | /* just for backward compatibility */ |