From: Tom Rini <trini@konsulko.com>
Date: Mon, 15 Feb 2021 13:19:40 +0000 (-0500)
Subject: Merge branch '2021-02-02-drop-asm_global_data-when-unused'
X-Git-Url: http://git.dujemihanovic.xyz/%7B%7B%20%24style.RelPermalink%20%7D%7D?a=commitdiff_plain;h=2ae80437fbe0181184ae4b188b89629b902702c6;p=u-boot.git

Merge branch '2021-02-02-drop-asm_global_data-when-unused'

- Merge the patch to take <asm/global_data.h> out of <common.h>
---

2ae80437fbe0181184ae4b188b89629b902702c6
diff --cc lib/efi_selftest/dtbdump.c
index 38ab9f8bf0,844d08246e..f6ddaa3072
--- a/lib/efi_selftest/dtbdump.c
+++ b/lib/efi_selftest/dtbdump.c
@@@ -9,7 -9,7 +9,8 @@@
  #include <common.h>
  #include <efi_api.h>
  #include <efi_dt_fixup.h>
 +#include <part.h>
+ #include <linux/libfdt.h>
  
  #define BUFFER_SIZE 64
  #define ESC 0x17