diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 18:05:14 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 18:05:14 +0300 |
| commit | c55b2d989a5b2ef85ad28229484279ac7c2c412a (patch) | |
| tree | 9a089c72523465a0c57439979b9ba8558f2efe0b /drivers/perf/Makefile | |
| parent | 7a4c66d0c10ccde344d723e40e0a6b3542ed5bc2 (diff) | |
| parent | 832c927d119b5be3a01376b8e3033286eb5797e1 (diff) | |
| download | linux-c55b2d989a5b2ef85ad28229484279ac7c2c412a.tar.xz | |
Merge tag 'xgene-drivers-for-4.9' of https://github.com/AppliedMicro/xgene-next into next/drivers
Pull "X-Gene driver changes queued for v4.9" from Duc Dang:
This patch set includes:
+ X-Gene SoC Performance Monitoring Unit (PMU) driver
* tag 'xgene-drivers-for-4.9' of https://github.com/AppliedMicro/xgene-next:
perf: xgene: Add APM X-Gene SoC Performance Monitoring Unit driver
Documentation: Add documentation for APM X-Gene SoC PMU DTS binding
MAINTAINERS: Add entry for APM X-Gene SoC PMU driver
Diffstat (limited to 'drivers/perf/Makefile')
| -rw-r--r-- | drivers/perf/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile index acd2397ded94..b116e982810b 100644 --- a/drivers/perf/Makefile +++ b/drivers/perf/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_ARM_PMU) += arm_pmu.o +obj-$(CONFIG_XGENE_PMU) += xgene_pmu.o |