summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/omap_common.h
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2014-04-29 17:41:19 +0200
committerStefano Babic <sbabic@denx.de>2014-04-29 17:41:19 +0200
commit3deb22a4844cbda1a05c60dd29d8926e4dddaa4e (patch)
tree767063f0d9e0acfd7445db47abf0d4ac94abdc1d /arch/arm/include/asm/omap_common.h
parent3b31605aef069d183a9d0c1e3aa6f957503cd56b (diff)
parentc9aab0f9dd23fddcebf5984dc19e62b514e759a7 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm/omap_common.h')
-rw-r--r--arch/arm/include/asm/omap_common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 04925bca1cd..729723afefe 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -574,6 +574,8 @@ void abb_setup(u32 fuse, u32 ldovbb, u32 setup, u32 control,
u32 txdone, u32 txdone_mask, u32 opp);
s8 abb_setup_ldovbb(u32 fuse, u32 ldovbb);
+void usb_fake_mac_from_die_id(u32 *id);
+
/* HW Init Context */
#define OMAP_INIT_CONTEXT_SPL 0
#define OMAP_INIT_CONTEXT_UBOOT_FROM_NOR 1