diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 10:05:42 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 10:05:42 +0200 |
commit | 05d134b084590684bcf4d832c0035952727b7cd9 (patch) | |
tree | 8f5d5fd811634fa621792cad7ca361251c06cd88 /arch/blackfin/include/asm/u-boot.h | |
parent | 6130c14605de760bdcaef36b8a0d34eac2a955f0 (diff) | |
parent | d7782d06534fe4fa47a49fa7c106de5ba85a9687 (diff) | |
download | u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.zip u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.tar.gz u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.tar.bz2 |
Merge remote-tracking branch 'u-boot/master'
Conflicts:
boards.cfg
Conflicts were trivial once u-boot-arm/master boards.cfg was
reformatted (commit 6130c146) to match u-boot/master's own
reformatting (commit 1b37fa83).
Diffstat (limited to 'arch/blackfin/include/asm/u-boot.h')
-rw-r--r-- | arch/blackfin/include/asm/u-boot.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/u-boot.h b/arch/blackfin/include/asm/u-boot.h index fc36ced..acaeee9 100644 --- a/arch/blackfin/include/asm/u-boot.h +++ b/arch/blackfin/include/asm/u-boot.h @@ -13,7 +13,6 @@ #define _U_BOOT_H_ 1 typedef struct bd_info { - unsigned int bi_baudrate; /* serial console baudrate */ unsigned long bi_boot_params; /* where this board expects params */ unsigned long bi_memstart; /* start of DRAM memory */ phys_size_t bi_memsize; /* size of DRAM memory in bytes */ |