Merge remote-tracking branch 'u-boot/master' into 'u-boot-arm/master'

[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..7eacf27a935b640d7b337626bac8796a2ba371ca 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/sys_proto.h
+++ b/arch/arm/include/asm/arch-am33xx/sys_proto.h
@@ -10,11 +10,10 @@
 
 #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
-
 u32 get_cpu_rev(void);
 u32 get_sysboot_value(void);