diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-06-04 05:41:48 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-06-04 05:42:27 -0400 |
| commit | cdbc653a04ee692a7105a96e8dd6055d9971d45c (patch) | |
| tree | c1282680b3115edfd693a27bc6758208534ac557 /sound/pci/ctxfi/cttimer.c | |
| parent | 009f8c90f571d87855914dbc20e6c0ea2a3b19ae (diff) | |
| parent | ceec4684085a9e4dc60439d84ab47ce260444804 (diff) | |
Merge branch 'for-next' into for-linus
4.18-rc1 merge material.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi/cttimer.c')
| -rw-r--r-- | sound/pci/ctxfi/cttimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ctxfi/cttimer.c b/sound/pci/ctxfi/cttimer.c index 08e874e9a7f6..2099e9ce441a 100644 --- a/sound/pci/ctxfi/cttimer.c +++ b/sound/pci/ctxfi/cttimer.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | static bool use_system_timer; | 18 | static bool use_system_timer; |
| 19 | MODULE_PARM_DESC(use_system_timer, "Force to use system-timer"); | 19 | MODULE_PARM_DESC(use_system_timer, "Force to use system-timer"); |
| 20 | module_param(use_system_timer, bool, S_IRUGO); | 20 | module_param(use_system_timer, bool, 0444); |
| 21 | 21 | ||
| 22 | struct ct_timer_ops { | 22 | struct ct_timer_ops { |
| 23 | void (*init)(struct ct_timer_instance *); | 23 | void (*init)(struct ct_timer_instance *); |