projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-am33xx
/
clock.h
diff --git
a/arch/arm/include/asm/arch-am33xx/clock.h
b/arch/arm/include/asm/arch-am33xx/clock.h
index
0d4b9ae
..
519249e
100644
(file)
--- a/
arch/arm/include/asm/arch-am33xx/clock.h
+++ b/
arch/arm/include/asm/arch-am33xx/clock.h
@@
-13,6
+13,10
@@
#include <asm/arch/clocks_am33xx.h>
+#ifdef CONFIG_TI81XX
+#include <asm/arch/clock_ti81xx.h>
+#endif
+
#define LDELAY 1000000
/*CM_<clock_domain>__CLKCTRL */