aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/omap-common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-07-24 16:39:56 -0400
committerTom Rini <trini@konsulko.com>2015-07-24 16:39:56 -0400
commit6f4e050639241218987541f4729172e4e0e2ff31 (patch)
tree0b7555fa699540dc975d179551211dd95c650a46 /arch/arm/cpu/armv7/omap-common
parent5a9749ee12bed44ca4dc7f2412b5a340db666954 (diff)
parent58d6d139c3e7bb923029e7ba18bfec7f420ead0f (diff)
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common')
-rw-r--r--arch/arm/cpu/armv7/omap-common/boot-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index bbc6bed7ca..7fc0a561b7 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -163,7 +163,7 @@ void arch_preboot_os(void)
}
#endif
-#if defined(CONFIG_CMD_FASTBOOT) && !defined(CONFIG_ENV_IS_NOWHERE)
+#if defined(CONFIG_USB_FUNCTION_FASTBOOT) && !defined(CONFIG_ENV_IS_NOWHERE)
int fb_set_reboot_flag(void)
{
printf("Setting reboot to fastboot flag ...\n");