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 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
mach
/
time.h
diff --git
a/arch/arm/include/asm/mach/time.h
b/arch/arm/include/asm/mach/time.h
index
8bffc3f
..
35d408f
100644
(file)
--- a/
arch/arm/include/asm/mach/time.h
+++ b/
arch/arm/include/asm/mach/time.h
@@
-38,7
+38,7
@@
struct sys_timer {
void (*init)(void);
void (*suspend)(void);
void (*resume)(void);
-#if
ndef CONFIG_GENERIC_TIME
+#if
def CONFIG_ARCH_USES_GETTIMEOFFSET
unsigned long (*offset)(void);
#endif
};