diff options
author | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-25 17:14:31 +0100 |
---|---|---|
committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-25 17:14:31 +0100 |
commit | a2e9f3073cc4ca259bba5906ac4f69fe12189770 (patch) | |
tree | fbd3750e68d7c6f5ecab59a8d7dd6d5c212fccd4 /arch/arm64/kernel/perf_event.c | |
parent | 882ad6f719d2fffca930b2dc8f820cd0a390f101 (diff) | |
parent | 399913a27a52c82abcdb606480652274c7ea8d53 (diff) |
Merge branch 'acpi' of git://git.linaro.org/arm/acpi/acpi into leg-kernelleg-20130925.0
Conflicts:
arch/arm/Kconfig
arch/arm/kernel/setup.c
Diffstat (limited to 'arch/arm64/kernel/perf_event.c')
-rw-r--r-- | arch/arm64/kernel/perf_event.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index cea1594ff933..460f158cfb67 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -28,6 +28,9 @@ #include <linux/platform_device.h> #include <linux/spinlock.h> #include <linux/uaccess.h> +#ifdef CONFIG_ACPI +#include <linux/acpi.h> +#endif #include <asm/cputype.h> #include <asm/irq.h> @@ -1232,6 +1235,13 @@ static struct of_device_id armpmu_of_device_ids[] = { {}, }; +#ifdef CONFIG_ACPI +static const struct acpi_device_id armpmu_acpi_match[] = { + { "LINA0007", }, + {}, +}; +#endif + static int armpmu_device_probe(struct platform_device *pdev) { if (!cpu_pmu) @@ -1245,6 +1255,9 @@ static struct platform_driver armpmu_driver = { .driver = { .name = "arm-pmu", .of_match_table = armpmu_of_device_ids, +#ifdef CONFIG_ACPI + .acpi_match_table = ACPI_PTR(armpmu_acpi_match), +#endif }, .probe = armpmu_device_probe, }; |