diff options
| author | Tom Rini <trini@ti.com> | 2014-10-26 14:03:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-26 14:03:08 -0400 |
| commit | 84a6df09c78bc9e9cbc6265d99c9097f5f1079f2 (patch) | |
| tree | 3b2bf1b3689e9aad0d20f5a69ada168cae3cc769 /drivers/serial/serial_pl01x.c | |
| parent | c69ecd9722af22d50295eff81d0b9cd5b8adc2e0 (diff) | |
| parent | c2ded962d4703a3f9522553004db4a6fe540f7e6 (diff) | |
| download | blackbird-obmc-uboot-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.tar.gz blackbird-obmc-uboot-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.zip | |
Merge git://git.denx.de/u-boot-dm
Fix a trivial conflict over adding <dm.h>
Conflicts:
arch/arm/cpu/armv7/omap3/board.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/serial/serial_pl01x.c')
| -rw-r--r-- | drivers/serial/serial_pl01x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index e6313ad3d3..38dda91021 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -17,7 +17,7 @@ #include <watchdog.h> #include <asm/io.h> #include <serial.h> -#include <serial_pl01x.h> +#include <dm/platform_data/serial_pl01x.h> #include <linux/compiler.h> #include "serial_pl01x_internal.h" |
