summaryrefslogtreecommitdiff
path: root/arch/nios2/include/asm/global_data.h
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2012-11-10 08:05:54 +0100
committerStefano Babic <sbabic@denx.de>2012-11-10 08:05:54 +0100
commit3e4d27b06d7484040355e22eec2cbce7335d6dab (patch)
tree9672a2bb2e4ce0edc0ab776ddf0e2ca8e39a5f62 /arch/nios2/include/asm/global_data.h
parentbad05afe083eec0467220de21683443292c5012e (diff)
parent59852d03867108217fe88e3bfc3e1e9cedfe63c5 (diff)
downloadolio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.tar.xz
olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.zip
Merge git://git.denx.de/u-boot
Diffstat (limited to 'arch/nios2/include/asm/global_data.h')
-rw-r--r--arch/nios2/include/asm/global_data.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h
index 3b0d9e629..413b485b6 100644
--- a/arch/nios2/include/asm/global_data.h
+++ b/arch/nios2/include/asm/global_data.h
@@ -26,7 +26,7 @@
typedef struct global_data {
bd_t *bd;
unsigned long flags;
- unsigned long baudrate;
+ unsigned int baudrate;
unsigned long cpu_clk; /* CPU clock in Hz! */
unsigned long have_console; /* serial_init() was called */
#ifdef CONFIG_PRE_CONSOLE_BUFFER