git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
mxc.h
diff --git
a/arch/arm/plat-mxc/include/mach/mxc.h
b/arch/arm/plat-mxc/include/mach/mxc.h
index
0987923
..
00a7819
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/mxc.h
+++ b/
arch/arm/plat-mxc/include/mach/mxc.h
@@
-183,13
+183,6
@@
struct cpu_op {
};
int tzic_enable_wake(int is_idle);
};
int tzic_enable_wake(int is_idle);
-enum mxc_cpu_pwr_mode {
- WAIT_CLOCKED, /* wfi only */
- WAIT_UNCLOCKED, /* WAIT */
- WAIT_UNCLOCKED_POWER_OFF, /* WAIT + SRPG */
- STOP_POWER_ON, /* just STOP */
- STOP_POWER_OFF, /* STOP + SRPG */
-};
extern struct cpu_op *(*get_cpu_op)(int *op);
#endif
extern struct cpu_op *(*get_cpu_op)(int *op);
#endif