diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:49:03 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-04 09:05:44 -0500 |
| commit | a0d3c820c43e040b001c912a717942219e0fe3ab (patch) | |
| tree | 28c16048e84859b89ab131ee69b82b62468b83e5 /arch/powerpc/include | |
| parent | 923a662f2fb09aa67c1ec0de25474c218fad2690 (diff) | |
| download | talos-obmc-uboot-a0d3c820c43e040b001c912a717942219e0fe3ab.tar.gz talos-obmc-uboot-a0d3c820c43e040b001c912a717942219e0fe3ab.zip | |
ppc: Move wdt_last 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/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/global_data.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index 52aece012c..b138e6460b 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -125,6 +125,9 @@ struct arch_global_data { #ifdef CONFIG_SYS_FPGA_COUNT unsigned fpga_state[CONFIG_SYS_FPGA_COUNT]; #endif +#if defined(CONFIG_WD_MAX_RATE) + unsigned long long wdt_last; /* trace watch-dog triggering rate */ +#endif }; /* @@ -173,9 +176,6 @@ typedef struct global_data { #if defined(CONFIG_LWMON) || defined(CONFIG_LWMON5) unsigned long kbd_status; #endif -#if defined(CONFIG_WD_MAX_RATE) - unsigned long long wdt_last; /* trace watch-dog triggering rate */ -#endif void **jt; /* jump table */ char env_buf[32]; /* buffer for getenv() before reloc. */ struct arch_global_data arch; /* architecture-specific data */ |
