git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-at91
/
at91x40_time.c
diff --git
a/arch/arm/mach-at91/at91x40_time.c
b/arch/arm/mach-at91/at91x40_time.c
index c0e637adf65d2555adddaa1897730fc4021d04d7..07d0bf2ac2dac18d2ad7b2c83e201134fc778bb8 100644
(file)
--- a/
arch/arm/mach-at91/at91x40_time.c
+++ b/
arch/arm/mach-at91/at91x40_time.c
@@
-25,6
+25,7
@@
#include <linux/time.h>
#include <linux/io.h>
#include <mach/hardware.h>
+#include <mach/at91x40.h>
#include <asm/mach/time.h>
#include "at91_tc.h"