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-omap1
/
include
/
mach
/
hardware.h
diff --git
a/arch/arm/mach-omap1/include/mach/hardware.h
b/arch/arm/mach-omap1/include/mach/hardware.h
index 5875a5098d35ff43211c8a54730998fcc92d1119..e7c8ac7d83e3c1a62afc021c2575c04931653179 100644
(file)
--- a/
arch/arm/mach-omap1/include/mach/hardware.h
+++ b/
arch/arm/mach-omap1/include/mach/hardware.h
@@
-36,7
+36,7
@@
#ifndef __ASM_ARCH_OMAP_HARDWARE_H
#define __ASM_ARCH_OMAP_HARDWARE_H
-#include <
asm
/sizes.h>
+#include <
linux
/sizes.h>
#ifndef __ASSEMBLER__
#include <asm/types.h>
#include <mach/soc.h>