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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-cap9adk.c
diff --git
a/arch/arm/mach-at91/board-cap9adk.c
b/arch/arm/mach-at91/board-cap9adk.c
index
1854371
..
e5512d1
100644
(file)
--- a/
arch/arm/mach-at91/board-cap9adk.c
+++ b/
arch/arm/mach-at91/board-cap9adk.c
@@
-45,7
+45,7
@@
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91cap9_matrix.h>
-#include <asm/arch/at91sam9
26x_
mc.h>
+#include <asm/arch/at91sam9
_s
mc.h>
#include "generic.h"