diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-11 13:12:11 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-11 13:12:11 -0400 |
| commit | 1b67fd086dd7be076f190dfe4b52403d0cf58375 (patch) | |
| tree | b7ea623c62bd8b1a1310c5e9d24dbf155a9d04aa /drivers/pinctrl/samsung/pinctrl-samsung.c | |
| parent | b5331379bc62611d1026173a09c73573384201d9 (diff) | |
| parent | 7b75cd5128421c673153efb1236705696a1a9812 (diff) | |
| download | linux-next-1b67fd086dd7be076f190dfe4b52403d0cf58375.tar.gz | |
Merge tag 'kvmarm-fixes-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for Linux 5.9, take #1
- Multiple stolen time fixes, with a new capability to match x86
- Fix for hugetlbfs mappings when PUD and PMD are the same level
- Fix for hugetlbfs mappings when PTE mappings are enforced
(dirty logging, for example)
- Fix tracing output of 64bit values
Diffstat (limited to 'drivers/pinctrl/samsung/pinctrl-samsung.c')
| -rw-r--r-- | drivers/pinctrl/samsung/pinctrl-samsung.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index f26574ef234a..608eb5a07248 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -1140,7 +1140,7 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) return 0; } -/** +/* * samsung_pinctrl_suspend - save pinctrl state for suspend * * Save data for all banks handled by this device. @@ -1187,7 +1187,7 @@ static int __maybe_unused samsung_pinctrl_suspend(struct device *dev) return 0; } -/** +/* * samsung_pinctrl_resume - restore pinctrl state from suspend * * Restore one of the banks that was saved during suspend. |