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 commit 'v2.6.27-rc7' into x86/debug
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
at91x40.c
diff --git
a/arch/arm/mach-at91/at91x40.c
b/arch/arm/mach-at91/at91x40.c
index
f446477
..
ad3ec85
100644
(file)
--- a/
arch/arm/mach-at91/at91x40.c
+++ b/
arch/arm/mach-at91/at91x40.c
@@
-14,9
+14,9
@@
#include <linux/init.h>
#include <linux/irq.h>
#include <asm/mach/arch.h>
#include <linux/init.h>
#include <linux/irq.h>
#include <asm/mach/arch.h>
-#include <
asm/ar
ch/at91x40.h>
-#include <
asm/ar
ch/at91_st.h>
-#include <
asm/ar
ch/timex.h>
+#include <
ma
ch/at91x40.h>
+#include <
ma
ch/at91_st.h>
+#include <
ma
ch/timex.h>
#include "generic.h"
/*
#include "generic.h"
/*