summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-05-20 22:33:44 +0200
committerWolfgang Denk <wd@denx.de>2012-05-20 22:33:44 +0200
commit8bd07c9aaf4628931ab8da6eb0f83e517d9381a7 (patch)
treea0b3d31f7b56426cef184f8e6c21fff2aedf49ce /arch/arm/include
parentee3a55fdf00b54391e406217e53674449e70d78b (diff)
parentde30122bb58fee7b0f94bcfabab595b6ad757336 (diff)
downloadu-boot-imx-8bd07c9aaf4628931ab8da6eb0f83e517d9381a7.zip
u-boot-imx-8bd07c9aaf4628931ab8da6eb0f83e517d9381a7.tar.gz
u-boot-imx-8bd07c9aaf4628931ab8da6eb0f83e517d9381a7.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-net
* 'master' of git://git.denx.de/u-boot-net: net: move bootfile init into eth_initialize net: punt bd->bi_ip_addr net: cosmetic: netconsole.c checkpatch compliance net: cosmetic: tftp.* checkpatch compliance net: cosmetic: sntp.* checkpatch compliance net: cosmetic: rarp.* checkpatch compliance net: cosmetic: nfs.* checkpatch compliance net: cosmetic: net.c checkpatch compliance net: cosmetic: eth.c checkpatch compliance net: cosmetic: bootp.* checkpatch compliance net: cosmetic: net.h checkpatch compliance net: Remove volatile from net API
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/u-boot.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h
index 20e1653..eac3800 100644
--- a/arch/arm/include/asm/u-boot.h
+++ b/arch/arm/include/asm/u-boot.h
@@ -38,7 +38,6 @@
typedef struct bd_info {
int bi_baudrate; /* serial console baudrate */
- unsigned long bi_ip_addr; /* IP Address */
ulong bi_arch_number; /* unique id for this board */
ulong bi_boot_params; /* where this board expects params */
unsigned long bi_arm_freq; /* arm frequency */