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 'bkl-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-omap
/
cpu-omap.c
diff --git
a/arch/arm/plat-omap/cpu-omap.c
b/arch/arm/plat-omap/cpu-omap.c
index 341235c278acbdcffe93a61387832a2f3e74e053..f8ddbdd8b076e9ae5b830aab3a5615b8fc1fc7ea 100644
(file)
--- a/
arch/arm/plat-omap/cpu-omap.c
+++ b/
arch/arm/plat-omap/cpu-omap.c
@@
-23,7
+23,7
@@
#include <linux/io.h>
#include <mach/hardware.h>
-#include <
mach
/clock.h>
+#include <
plat
/clock.h>
#include <asm/system.h>
#define VERY_HI_RATE 900000000