diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-10 08:04:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-10 08:04:53 -0500 |
| commit | 2e8560797fc69a34c330a875da4f5d2992452f1e (patch) | |
| tree | fadec67e667ef3d72d62cef98aa3b3b19b2dd4a5 /drivers/serial/serial_pl01x.c | |
| parent | 97276a91db8e98f081a40ddf9dc8f81d4032a756 (diff) | |
| parent | 4a1fa524e95a1c81674d8a368035b522fd4a99d6 (diff) | |
Merge branch '2019-02-08-master-imports'
- bcm6345 watchdog, bcm63158/bcm963158 initial support.
- Various TI platform resyncs and improvements.
- FDT support in Android-format images.
- stm32mp1 improvements.
Diffstat (limited to 'drivers/serial/serial_pl01x.c')
| -rw-r--r-- | drivers/serial/serial_pl01x.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 12512f6578..2a5f256184 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -363,9 +363,7 @@ U_BOOT_DRIVER(serial_pl01x) = { .platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata), .probe = pl01x_serial_probe, .ops = &pl01x_serial_ops, -#if !CONFIG_IS_ENABLED(OF_CONTROL) .flags = DM_FLAG_PRE_RELOC, -#endif .priv_auto_alloc_size = sizeof(struct pl01x_priv), }; |