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 git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-mx7
/
sys_proto.h
diff --git
a/arch/arm/include/asm/arch-mx7/sys_proto.h
b/arch/arm/include/asm/arch-mx7/sys_proto.h
index 15e24d44b382377fbf2d7de61bb763c0f15e74db..fa624248b2e93a4baf18e17187c73d33140b25f5 100644
(file)
--- a/
arch/arm/include/asm/arch-mx7/sys_proto.h
+++ b/
arch/arm/include/asm/arch-mx7/sys_proto.h
@@
-7,3
+7,4
@@
#include <asm/mach-imx/sys_proto.h>
void set_wdog_reset(struct wdog_regs *wdog);
+enum boot_device get_boot_device(void);