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 branch 'master' of git://git.denx.de/u-boot-samsung
[oweals/u-boot.git]
/
arch
/
arm
/
mach-rockchip
/
rk322x-board.c
diff --git
a/arch/arm/mach-rockchip/rk322x-board.c
b/arch/arm/mach-rockchip/rk322x-board.c
index 99a60c4e2ee62178da8b9d6315b43c6ac83c5aeb..7366d45ab6c0ef7ffd4df31ccdddb5740a708add 100644
(file)
--- a/
arch/arm/mach-rockchip/rk322x-board.c
+++ b/
arch/arm/mach-rockchip/rk322x-board.c
@@
-139,8
+139,8
@@
int board_usb_cleanup(int index, enum usb_init_type init)
}
#endif
-#if
defined(CONFIG_USB_FUNCTION_
FASTBOOT)
-int f
b
_set_reboot_flag(void)
+#if
CONFIG_IS_ENABLED(
FASTBOOT)
+int f
astboot
_set_reboot_flag(void)
{
struct rk322x_grf *grf;