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 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
clock.c
diff --git
a/arch/arm/mach-at91/clock.c
b/arch/arm/mach-at91/clock.c
index
daebd72
..
f5c2847
100644
(file)
--- a/
arch/arm/mach-at91/clock.c
+++ b/
arch/arm/mach-at91/clock.c
@@
-25,9
+25,9
@@
#include <asm/io.h>
-#include <
asm/ar
ch/hardware.h>
-#include <
asm/ar
ch/at91_pmc.h>
-#include <
asm/ar
ch/cpu.h>
+#include <
ma
ch/hardware.h>
+#include <
ma
ch/at91_pmc.h>
+#include <
ma
ch/cpu.h>
#include "clock.h"