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 tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-sa1100
/
neponset.c
diff --git
a/arch/arm/mach-sa1100/neponset.c
b/arch/arm/mach-sa1100/neponset.c
index eb60a71cf125a4b78c57e51bcbe5d55f53eb49c6..a671e4c994cfa315ea2b8025523abc9dbbf40ea5 100644
(file)
--- a/
arch/arm/mach-sa1100/neponset.c
+++ b/
arch/arm/mach-sa1100/neponset.c
@@
-21,7
+21,7
@@
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/hardware/sa1111.h>
-#include <
asm
/sizes.h>
+#include <
linux
/sizes.h>
#include <mach/hardware.h>
#include <mach/assabet.h>