diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-07 01:05:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-07 01:05:17 +0100 |
| commit | 9ccad66f0171578445175ecd3bf66b35a96aaf6e (patch) | |
| tree | 78c1be21493ef183de9444cf0d2bfb1e729b0698 /tools | |
| parent | Merge branch 'acpi-pci-hotplug' into acpi-hotplug (diff) | |
| parent | ACPI: Clean up inclusions of ACPI header files (diff) | |
| download | wireguard-linux-9ccad66f0171578445175ecd3bf66b35a96aaf6e.tar.xz wireguard-linux-9ccad66f0171578445175ecd3bf66b35a96aaf6e.zip | |
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts:
drivers/acpi/scan.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c index 66cace601e57..0f10b81e3322 100644 --- a/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +++ b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c @@ -25,12 +25,9 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/delay.h> - +#include <linux/acpi.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> - static int pm_tmr_ioport = 0; /*helper function to safely read acpi pm timesource*/ |