summaryrefslogtreecommitdiffstats
path: root/include/asm-nios2/global_data.h
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2008-07-10 10:26:07 +0200
committerMarkus Klotzbuecher <mk@denx.de>2008-07-10 10:26:07 +0200
commit794a5924972fc8073616e98a2668da4a5f9aea90 (patch)
treedd0db39b3e183b5bcb0300d5377d7a0d5ac5fd0c /include/asm-nios2/global_data.h
parentf2aeecc320f5b181b30effcaa67683aec8d5a843 (diff)
parent4188f0491886b3b486164e819c0a83fdb97efd7d (diff)
downloadblackbird-obmc-uboot-794a5924972fc8073616e98a2668da4a5f9aea90.tar.gz
blackbird-obmc-uboot-794a5924972fc8073616e98a2668da4a5f9aea90.zip
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'include/asm-nios2/global_data.h')
-rw-r--r--include/asm-nios2/global_data.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-nios2/global_data.h b/include/asm-nios2/global_data.h
index 729048917b..cd17e0894f 100644
--- a/include/asm-nios2/global_data.h
+++ b/include/asm-nios2/global_data.h
@@ -29,7 +29,7 @@ typedef struct global_data {
unsigned long baudrate;
unsigned long cpu_clk; /* CPU clock in Hz! */
unsigned long have_console; /* serial_init() was called */
- unsigned long ram_size; /* RAM size */
+ phys_size_t ram_size; /* RAM size */
unsigned long reloc_off; /* Relocation Offset */
unsigned long env_addr; /* Address of Environment struct */
unsigned long env_valid; /* Checksum of Environment valid */
OpenPOWER on IntegriCloud