diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-04-10 12:01:24 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-04-10 12:01:24 +0200 |
| commit | cdde51b9fe83a20fd6c50e81473e6ffb5ba63b92 (patch) | |
| tree | 72e35bb87ad895c7cea6310d8f599886d3d9979b /drivers/cpuidle/cpuidle-zynq.c | |
| parent | Merge tag 'pm+acpi-4.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Merge branch 'cpuidle/4.1' of http://git.linaro.org/people/daniel.lezcano/lin... (diff) | |
| download | linux-cdde51b9fe83a20fd6c50e81473e6ffb5ba63b92.tar.xz linux-cdde51b9fe83a20fd6c50e81473e6ffb5ba63b92.zip | |
Merge back earlier cpuidle material for v4.1.
Diffstat (limited to 'drivers/cpuidle/cpuidle-zynq.c')
| -rw-r--r-- | drivers/cpuidle/cpuidle-zynq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c index 002b8c9f98f5..543292b1d38e 100644 --- a/drivers/cpuidle/cpuidle-zynq.c +++ b/drivers/cpuidle/cpuidle-zynq.c @@ -28,7 +28,6 @@ #include <linux/init.h> #include <linux/cpuidle.h> #include <linux/platform_device.h> -#include <asm/proc-fns.h> #include <asm/cpuidle.h> #define ZYNQ_MAX_STATES 2 |