Internally include file and ACPI_PTR are already protected in the case of #ifndef CONFIG_ACPI so we don't need these checks. --- arch/arm64/kernel/perf_event.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 460f158..85e6e3a 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -28,9 +28,7 @@ #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> @@ -1255,9 +1253,7 @@ 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, };
Acked-by: Graeme Gregory graeme.gregory@linaro.org
On Fri, Nov 22, 2013 at 11:05:53AM +0100, Tomasz Nowicki wrote:
Internally include file and ACPI_PTR are already protected in the case of #ifndef CONFIG_ACPI so we don't need these checks.
arch/arm64/kernel/perf_event.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 460f158..85e6e3a 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -28,9 +28,7 @@ #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> @@ -1255,9 +1253,7 @@ 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, }; -- 1.7.9.5
Linaro-acpi mailing list Linaro-acpi@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-acpi
-
Graeme Gregory -
Tomasz Nowicki