OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel-stable' into for-linus
[android-x86/kernel.git]
/
arch
/
arm
/
plat-mxc
/
time.c
diff --git
a/arch/arm/plat-mxc/time.c
b/arch/arm/plat-mxc/time.c
index
e4ac94a
..
4b0fe28
100644
(file)
--- a/
arch/arm/plat-mxc/time.c
+++ b/
arch/arm/plat-mxc/time.c
@@
-54,7
+54,7
@@
#define MX2_TSTAT_CAPT (1 << 1)
#define MX2_TSTAT_COMP (1 << 0)
-/* MX31, MX35, MX25, MX
C91231, MX
5 */
+/* MX31, MX35, MX25, MX5 */
#define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */
#define V2_TCTL_CLK_IPG (1 << 6)
#define V2_TCTL_FRR (1 << 9)