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/avr32/include/asm/global_data.h | |
parent | bad05afe083eec0467220de21683443292c5012e (diff) | |
parent | 59852d03867108217fe88e3bfc3e1e9cedfe63c5 (diff) | |
download | talos-obmc-uboot-3e4d27b06d7484040355e22eec2cbce7335d6dab.tar.gz talos-obmc-uboot-3e4d27b06d7484040355e22eec2cbce7335d6dab.zip |
Merge git://git.denx.de/u-boot
Diffstat (limited to 'arch/avr32/include/asm/global_data.h')
-rw-r--r-- | arch/avr32/include/asm/global_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/include/asm/global_data.h b/arch/avr32/include/asm/global_data.h index 7878bb185a..bf661e23be 100644 --- a/arch/avr32/include/asm/global_data.h +++ b/arch/avr32/include/asm/global_data.h @@ -33,7 +33,7 @@ typedef struct global_data { bd_t *bd; unsigned long flags; - unsigned long baudrate; + unsigned int baudrate; unsigned long stack_end; /* highest stack address */ unsigned long have_console; /* serial_init() was called */ #ifdef CONFIG_PRE_CONSOLE_BUFFER |