projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'net' of git://www.denx.de/git/u-boot-microblaze
[oweals/u-boot.git]
/
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 60e872637fc911a14ec8256ded6cf855676a89c8..63e4ad5a6744bd777b0d66ec390fca22c97e3fcf 100644
(file)
--- a/
arch/arm/include/asm/global_data.h
+++ b/
arch/arm/include/asm/global_data.h
@@
-32,9
+32,6
@@
struct arch_global_data {
unsigned long tbl;
unsigned long lastinc;
unsigned long long timer_reset_value;
unsigned long tbl;
unsigned long lastinc;
unsigned long long timer_reset_value;
-#ifdef CONFIG_IXP425
- unsigned long timestamp;
-#endif
#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
unsigned long tlb_addr;
unsigned long tlb_size;
#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
unsigned long tlb_addr;
unsigned long tlb_size;