diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-24 09:50:00 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-24 09:50:00 +0200 |
| commit | 33144ea443c298ac9d6f04926a02881a5bae91a3 (patch) | |
| tree | 8d29378ecf90192f3f0f0637db89e0044d9c94cf /arch/arm/include/asm/arch-am33xx | |
| parent | 3eb5e198632dcc3e03b5742d1e0ebced0ef2f551 (diff) | |
| parent | 39338a30fab2ce7d80dfe0d457071573727f499f (diff) | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-am33xx')
| -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 91ff2ad0e4..33a82fca98 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 |