summaryrefslogtreecommitdiffstats
path: root/include/asm-nios/global_data.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-10-09 00:03:18 +0200
committerWolfgang Denk <wd@denx.de>2009-10-09 00:03:18 +0200
commitcd77dd109c4a439519a78c32eddc42bdebc7a61f (patch)
treec5534647cb1786044ef0f7e4ad4067725eddf11d /include/asm-nios/global_data.h
parent95c44ec485b46ffb43dbdaa299f1491a500fdadf (diff)
parentafc3ba0fc4195624e79e21244380ed7cc2fd6969 (diff)
downloadblackbird-obmc-uboot-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.gz
blackbird-obmc-uboot-cd77dd109c4a439519a78c32eddc42bdebc7a61f.zip
Merge branch 'reloc'
Diffstat (limited to 'include/asm-nios/global_data.h')
-rw-r--r--include/asm-nios/global_data.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-nios/global_data.h b/include/asm-nios/global_data.h
index 4929a5b872..fa54ee4dd3 100644
--- a/include/asm-nios/global_data.h
+++ b/include/asm-nios/global_data.h
@@ -31,7 +31,6 @@ typedef struct global_data {
unsigned long cpu_clk; /* CPU clock in Hz! */
unsigned long have_console; /* serial_init() was called */
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 */
#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)
OpenPOWER on IntegriCloud