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 tag 'signed-efi-2019.01' of git://github.com/agraf/u-boot
[oweals/u-boot.git]
/
drivers
/
serial
/
serial_sh.c
diff --git
a/drivers/serial/serial_sh.c
b/drivers/serial/serial_sh.c
index b1534981f8cc4488e5df0b555b516253145ba162..c934d5f25a6792f6582911f2cf9d58ac08f78808 100644
(file)
--- a/
drivers/serial/serial_sh.c
+++ b/
drivers/serial/serial_sh.c
@@
-247,7
+247,9
@@
U_BOOT_DRIVER(serial_sh) = {
.platdata_auto_alloc_size = sizeof(struct sh_serial_platdata),
.probe = sh_serial_probe,
.ops = &sh_serial_ops,
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
.flags = DM_FLAG_PRE_RELOC,
+#endif
.priv_auto_alloc_size = sizeof(struct uart_port),
};