diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 10:32:53 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 10:32:53 +0400 |
| commit | 8f57be8ee44d92ef161c5af685aedbb717db96e0 (patch) | |
| tree | d44a1cf0843390c6ff679f15e052ae1fc87680a8 /arch/arm/mach-at91/include/mach/at91cap9.h | |
| parent | cb7dee8d22f3e9320424e769d860fbd9712a0666 (diff) | |
| parent | fb149f9e2835446e02e796081635520b881dc351 (diff) | |
| download | linux-8f57be8ee44d92ef161c5af685aedbb717db96e0.tar.xz | |
Merge branch 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
at91: add arch specific ioremap support
at91: factorize sram init
at91: move register clocks to soc generic init
at91: move clock subsystem init to soc generic init
at91: use structure to store the current soc
at91: remove AT91_DBGU offset from dbgu register macro
at91: factorize at91 interrupts init to soc
at91: introduce commom AT91_BASE_SYS
Diffstat (limited to 'arch/arm/mach-at91/include/mach/at91cap9.h')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91cap9.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h index 665993849a7b..c5df1e8f1955 100644 --- a/arch/arm/mach-at91/include/mach/at91cap9.h +++ b/arch/arm/mach-at91/include/mach/at91cap9.h @@ -75,7 +75,6 @@ #define AT91CAP9_BASE_EMAC 0xfffbc000 #define AT91CAP9_BASE_ADC 0xfffc0000 #define AT91CAP9_BASE_ISI 0xfffc4000 -#define AT91_BASE_SYS 0xffffe200 /* * System Peripherals (offset from AT91_BASE_SYS) |