Home Home > GIT Browse > SLE12-SP3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-04-23 15:36:51 +0200
committerTakashi Iwai <tiwai@suse.de>2019-04-23 15:36:51 +0200
commitfa4155b0fa071768acea5e1c6d6b10128422fb03 (patch)
tree122e73cbd51e4e83924b474ce85220af98eb2abb
parentdbfe46bbc7bcefe8360003cf4919f6c25e469e9e (diff)
parent1e4c37c59384d45cfb64d4ed2ff82a21e4c050eb (diff)
Merge branch 'users/fbaumanis/SLE12-SP3/for-next' into SLE12-SP3SLE12-SP3
Pull hpet fix from Fabian Baumanis (bsc#1129770) suse-commit: ae697e39f8b6693506b3f8cebb009ef4ee2bb2c0
-rw-r--r--drivers/char/hpet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 240b6cf1d97c..72e073895ed9 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -376,7 +376,7 @@ static __init int hpet_mmap_enable(char *str)
pr_info("HPET mmap %s\n", hpet_mmap_enabled ? "enabled" : "disabled");
return 1;
}
-__setup("hpet_mmap", hpet_mmap_enable);
+__setup("hpet_mmap=", hpet_mmap_enable);
static int hpet_mmap(struct file *file, struct vm_area_struct *vma)
{