diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-28 08:14:48 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-28 08:14:48 +0400 |
| commit | c2e1ff39c106ab026e3feb29c038855b7ed00393 (patch) | |
| tree | e0255b5b9aed8645edc4426f2d4972280910e065 /arch/arm/mach-spear6xx/include/mach/spear.h | |
| parent | 456d3d42460c1fc20ba0d27442443fcd63aaac35 (diff) | |
| parent | b48b2c3e50433ff6f7e46186daa7f986bd960215 (diff) | |
| download | linux-c2e1ff39c106ab026e3feb29c038855b7ed00393.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Pull in Linus's tree to get the commits that blew away
ARCH_USES_GETTIMEOFFSET but didn't update Sparc correctly, so
that I can apply Stephen Rothwell's fix for that mis-merge.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-spear6xx/include/mach/spear.h')
| -rw-r--r-- | arch/arm/mach-spear6xx/include/mach/spear.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-spear6xx/include/mach/spear.h b/arch/arm/mach-spear6xx/include/mach/spear.h index d278ed047a53..cb8ed2f4dc85 100644 --- a/arch/arm/mach-spear6xx/include/mach/spear.h +++ b/arch/arm/mach-spear6xx/include/mach/spear.h @@ -25,7 +25,6 @@ /* ML-1, 2 - Multi Layer CPU Subsystem */ #define SPEAR6XX_ML_CPU_BASE UL(0xF0000000) #define VA_SPEAR6XX_ML_CPU_BASE UL(0xF0000000) -#define SPEAR6XX_CPU_TMR_BASE UL(0xF0000000) /* ICM3 - Basic Subsystem */ #define SPEAR6XX_ICM3_SMI_CTRL_BASE UL(0xFC000000) |