projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
cpuidle44xx.c
diff --git
a/arch/arm/mach-omap2/cpuidle44xx.c
b/arch/arm/mach-omap2/cpuidle44xx.c
index 45e6a54d58187844b66336bf42c29b9946f1a4e1..ee05e193fc61e317b21b368c583f31ce71bbb76b 100644
(file)
--- a/
arch/arm/mach-omap2/cpuidle44xx.c
+++ b/
arch/arm/mach-omap2/cpuidle44xx.c
@@
-23,8
+23,6
@@
#include "prm.h"
#include "clockdomain.h"
-#ifdef CONFIG_CPU_IDLE
-
/* Machine specific information */
struct omap4_idle_statedata {
u32 cpu_state;
@@
-252,9
+250,3
@@
int __init omap4_idle_init(void)
return 0;
}
-#else
-int __init omap4_idle_init(void)
-{
- return 0;
-}
-#endif /* CONFIG_CPU_IDLE */