diff options
| author | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
| commit | 3e4d27b06d7484040355e22eec2cbce7335d6dab (patch) | |
| tree | 9672a2bb2e4ce0edc0ab776ddf0e2ca8e39a5f62 /arch/x86/include/asm/global_data.h | |
| parent | bad05afe083eec0467220de21683443292c5012e (diff) | |
| parent | 59852d03867108217fe88e3bfc3e1e9cedfe63c5 (diff) | |
| download | olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.tar.xz olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.zip | |
Merge git://git.denx.de/u-boot
Diffstat (limited to 'arch/x86/include/asm/global_data.h')
| -rw-r--r-- | arch/x86/include/asm/global_data.h | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 6d29c0b9a..bce999f41 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -38,7 +38,7 @@ typedef	struct global_data {  	unsigned long	gd_addr;	/* Location of Global Data */  	bd_t		*bd;  	unsigned long	flags; -	unsigned long	baudrate; +	unsigned int	baudrate;  	unsigned long	have_console;	/* serial_init() was called */  #ifdef CONFIG_PRE_CONSOLE_BUFFER  	unsigned long	precon_buf_idx;	/* Pre-Console buffer index */ |