summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/global_data.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:48:37 +0000
committerTom Rini <trini@ti.com>2013-02-01 15:07:50 -0500
commitb4d51db86b783f0c6950803f8cced2c15d812327 (patch)
tree8680a1cdf26b9a5421ea9cfcc22848e79b86d811 /arch/arm/include/asm/global_data.h
parent5f70714c2feb94318f2c2a153f4089e32f353548 (diff)
ixp: Move timestamp to arch_global_data
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/include/asm/global_data.h')
-rw-r--r--arch/arm/include/asm/global_data.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index ea27c16d1d..5d414efaac 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -41,6 +41,9 @@ struct arch_global_data {
unsigned long tbl;
unsigned long lastinc;
unsigned long long timer_reset_value;
+#ifdef CONFIG_IXP425
+ unsigned long timestamp;
+#endif
};
/*
@@ -65,9 +68,6 @@ typedef struct global_data {
#ifdef CONFIG_FSL_ESDHC
unsigned long sdhc_clk;
#endif
-#ifdef CONFIG_IXP425
- unsigned long timestamp;
-#endif
unsigned long relocaddr; /* Start address of U-Boot in RAM */
phys_size_t ram_size; /* RAM size */
unsigned long mon_len; /* monitor len */