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-at91.c | |
parent | e5e02de0665ef2477e7a018193051387c6fe0fbc (diff) | |
parent | 993c592d745c467d83e753c9e8f4e9f952381478 (diff) |
Merge back earlier cpuidle material for v4.1.
Diffstat (limited to 'drivers/cpuidle/cpuidle-at91.c')
-rw-r--r-- | drivers/cpuidle/cpuidle-at91.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle-at91.c b/drivers/cpuidle/cpuidle-at91.c index aae7bfc1ea36..f2446c78d87c 100644 --- a/drivers/cpuidle/cpuidle-at91.c +++ b/drivers/cpuidle/cpuidle-at91.c @@ -19,7 +19,6 @@ #include <linux/cpuidle.h> #include <linux/io.h> #include <linux/export.h> -#include <asm/proc-fns.h> #include <asm/cpuidle.h> #define AT91_MAX_STATES 2 |