projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-am33xx
/
sys_proto.h
diff --git
a/arch/arm/include/asm/arch-am33xx/sys_proto.h
b/arch/arm/include/asm/arch-am33xx/sys_proto.h
index f73e285a899599456388305bc2a8e541eeb67855..33a82fca98db67e3c89a5dba552b92d22dd89111 100644
(file)
--- a/
arch/arm/include/asm/arch-am33xx/sys_proto.h
+++ b/
arch/arm/include/asm/arch-am33xx/sys_proto.h
@@
-10,7
+10,8
@@
#ifndef _SYS_PROTO_H_
#define _SYS_PROTO_H_
-#include <asm/omap_gpmc.h>
+#include <linux/mtd/omap_gpmc.h>
+#include <asm/ti-common/sys_proto.h>
#include <asm/arch/cpu.h>
#define BOARD_REV_ID 0x0