summaryrefslogtreecommitdiff
path: root/drivers/perf/arm_dsu_pmu.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-20 09:39:11 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-20 09:39:11 +0200
commit6f2c6599ba70da7ca9603f8026c4e3cdc273ee02 (patch)
tree88228298182133d9522be62c8cb3eecfcb595d49 /drivers/perf/arm_dsu_pmu.c
parentea1be1e59b19017e61aa357d524b743ba5602d3c (diff)
parentba47d845d715a010f7b51f6f89bae32845e6acb7 (diff)
Merge 5.8-rc6 into tty-next
We need the serial/tty fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/perf/arm_dsu_pmu.c')
-rw-r--r--drivers/perf/arm_dsu_pmu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c
index 518d0603e24f..96ed93cc78e6 100644
--- a/drivers/perf/arm_dsu_pmu.c
+++ b/drivers/perf/arm_dsu_pmu.c
@@ -757,6 +757,7 @@ static struct platform_driver dsu_pmu_driver = {
.driver = {
.name = DRVNAME,
.of_match_table = of_match_ptr(dsu_pmu_of_match),
+ .suppress_bind_attrs = true,
},
.probe = dsu_pmu_device_probe,
.remove = dsu_pmu_device_remove,