summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/global_data.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:48:36 +0000
committerTom Rini <trini@ti.com>2013-02-01 15:07:50 -0500
commit5f70714c2feb94318f2c2a153f4089e32f353548 (patch)
treee60c0721297f8bf8d30d8c797f0e4b3d09716d7f /arch/arm/include/asm/global_data.h
parent582601da2f90b1850aa19f7820b1623c79b3dac6 (diff)
downloadtalos-obmc-uboot-5f70714c2feb94318f2c2a153f4089e32f353548.tar.gz
talos-obmc-uboot-5f70714c2feb94318f2c2a153f4089e32f353548.zip
arm: Move timer_reset_value 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.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index d7d47430f1..ea27c16d1d 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -40,6 +40,7 @@ struct arch_global_data {
unsigned long tbu;
unsigned long tbl;
unsigned long lastinc;
+ unsigned long long timer_reset_value;
};
/*
@@ -64,10 +65,6 @@ typedef struct global_data {
#ifdef CONFIG_FSL_ESDHC
unsigned long sdhc_clk;
#endif
-#ifdef CONFIG_ARM
- /* "static data" needed by most of timer.c on ARM platforms */
- unsigned long long timer_reset_value;
-#endif
#ifdef CONFIG_IXP425
unsigned long timestamp;
#endif
OpenPOWER on IntegriCloud