Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / arch / arm / include / asm / global_data.h

diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index d4c9afcd0b92fa8dfb40809b650afc4feb686fa3..ef9959e6eefc53144707026f2e4c7df7bdd3a5f5 100644 (file)
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -60,6 +60,9 @@ typedef       struct  global_data {
        unsigned long   tbu;
        unsigned long long      timer_reset_value;
        unsigned long   lastinc;
+#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 */