summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-10 13:01:24 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-10 13:01:24 +0300
commitcdde51b9fe83a20fd6c50e81473e6ffb5ba63b92 (patch)
tree72e35bb87ad895c7cea6310d8f599886d3d9979b /arch/arm/mach-omap2
parente5e02de0665ef2477e7a018193051387c6fe0fbc (diff)
parent993c592d745c467d83e753c9e8f4e9f952381478 (diff)
downloadlinux-cdde51b9fe83a20fd6c50e81473e6ffb5ba63b92.tar.xz
Merge back earlier cpuidle material for v4.1.
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/cpuidle44xx.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
index 01e398a868bc..7622dbb05083 100644
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@ -17,7 +17,6 @@
#include <linux/clockchips.h>
#include <asm/cpuidle.h>
-#include <asm/proc-fns.h>
#include "common.h"
#include "pm.h"