diff options
author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-06-02 11:20:28 +0530 |
---|---|---|
committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-06-02 11:20:28 +0530 |
commit | d0fc6571e7c769847836aad3071a3b21a820eae5 (patch) | |
tree | 2c3f69540a367929200c47bf024ecc5ae2a17dbb /arch/arm/include/asm/arch-am33xx/sys_proto.h | |
parent | 3fa3bdcfdcb724087762c9dcf6b48e2525bbd6ff (diff) | |
parent | 90b51c33f362926e17d4c07dcef1ce822abaa89f (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'arch/arm/include/asm/arch-am33xx/sys_proto.h')
-rw-r--r-- | arch/arm/include/asm/arch-am33xx/sys_proto.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-am33xx/sys_proto.h b/arch/arm/include/asm/arch-am33xx/sys_proto.h index 91ff2ad0e..33a82fca9 100644 --- a/arch/arm/include/asm/arch-am33xx/sys_proto.h +++ b/arch/arm/include/asm/arch-am33xx/sys_proto.h @@ -11,6 +11,7 @@ #ifndef _SYS_PROTO_H_ #define _SYS_PROTO_H_ #include <linux/mtd/omap_gpmc.h> +#include <asm/ti-common/sys_proto.h> #include <asm/arch/cpu.h> #define BOARD_REV_ID 0x0 |