diff options
| author | Tom Rini <[email protected]> | 2020-03-17 09:54:45 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-03-17 09:54:45 -0400 |
| commit | 552c3d4c2d3a98658158fdb7213515d631f5e181 (patch) | |
| tree | 8f69c23d27d458081fd3e3dc9d244cd92ad05c96 /include/asm-generic | |
| parent | e24f0a39d0daa2d8c597650aeb3f559d44a195ae (diff) | |
| parent | 33b40389ea4a3c19a00ff63dafa3ba61d18ef0d9 (diff) | |
Merge branch '2020-03-16-kbuild-etc-resync-v4.18' into next
- Update our Kbuild / Kconfig and relate functionality to be in line
with the Linux kernel v4.18 release.
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/global_data.h | 2 | ||||
| -rw-r--r-- | include/asm-generic/u-boot.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 5d027329fe0..d9e220cfe35 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -25,7 +25,7 @@ #include <linux/list.h> typedef struct global_data { - bd_t *bd; + struct bd_info *bd; unsigned long flags; unsigned int baudrate; unsigned long cpu_clk; /* CPU clock in Hz! */ diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h index eee84f49bb1..cc94d39069e 100644 --- a/include/asm-generic/u-boot.h +++ b/include/asm-generic/u-boot.h @@ -23,6 +23,8 @@ #ifndef __ASSEMBLY__ +#include <linux/types.h> + typedef struct bd_info { unsigned long bi_memstart; /* start of DRAM memory */ phys_size_t bi_memsize; /* size of DRAM memory in bytes */ |