diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-19 07:15:01 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-19 07:15:01 +0100 |
| commit | a87a0ce7028d5371c81d77ba72c1ba43a1ca77bc (patch) | |
| tree | 98bff4a88314611dc6f7afea5f88953309940a51 /arch/arm/include/asm/global_data.h | |
| parent | c4d376fd1c2bce8d64cec0431dd3f24957b6dec4 (diff) | |
| parent | f8d1086851409ee16344932ef367b8a05c365b09 (diff) | |
| download | blackbird-obmc-uboot-a87a0ce7028d5371c81d77ba72c1ba43a1ca77bc.tar.gz blackbird-obmc-uboot-a87a0ce7028d5371c81d77ba72c1ba43a1ca77bc.zip | |
Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/global_data.h')
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 60e872637f..63e4ad5a67 100644 --- 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; -#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; |
