diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-04 22:39:32 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-04 22:39:32 +0100 |
| commit | dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb (patch) | |
| tree | f16ace0ae09edab16bf6d0be9e8280dfbb7100da /arch/arm/mach-at91/include/mach/at91cap9.h | |
| parent | mlx4: Fix typo in cmd.c (diff) | |
| parent | netprio_cgroup: Fix obo in get_prioidx (diff) | |
| download | linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.tar.xz linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/mach-at91/include/mach/at91cap9.h')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91cap9.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h index 4c0e2f6011d7..61d952902f2b 100644 --- a/arch/arm/mach-at91/include/mach/at91cap9.h +++ b/arch/arm/mach-at91/include/mach/at91cap9.h @@ -83,7 +83,6 @@ #define AT91_DDRSDRC0 (0xffffe600 - AT91_BASE_SYS) #define AT91_MATRIX (0xffffea00 - AT91_BASE_SYS) #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) -#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) #define AT91_GPBR (cpu_is_at91cap9_revB() ? \ (0xfffffd50 - AT91_BASE_SYS) : \ (0xfffffd60 - AT91_BASE_SYS)) @@ -96,6 +95,7 @@ #define AT91CAP9_BASE_PIOB 0xfffff400 #define AT91CAP9_BASE_PIOC 0xfffff600 #define AT91CAP9_BASE_PIOD 0xfffff800 +#define AT91CAP9_BASE_RSTC 0xfffffd00 #define AT91CAP9_BASE_SHDWC 0xfffffd10 #define AT91CAP9_BASE_RTT 0xfffffd20 #define AT91CAP9_BASE_PIT 0xfffffd30 |