diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 19:31:45 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 19:31:45 +0400 |
| commit | 66a2886d867343eff6bf2646bea2c923d0cbf620 (patch) | |
| tree | ad44dcca4fa410ab2c16b4964f6c19571421b4df /arch/arm/mach-spear6xx/include/mach/misc_regs.h | |
| parent | d2819f80d465672b09c2f4cb52303b7f951c4d0f (diff) | |
| parent | f613e220aebfafb653f7ce264950c15c99e27f2a (diff) | |
| download | linux-66a2886d867343eff6bf2646bea2c923d0cbf620.tar.xz | |
Merge branch 'spear/dt' into spear/clock
Conflicts:
arch/arm/mach-spear3xx/clock.c
arch/arm/mach-spear3xx/include/mach/generic.h
arch/arm/mach-spear3xx/include/mach/misc_regs.h
arch/arm/mach-spear3xx/spear320.c
arch/arm/mach-spear6xx/clock.c
arch/arm/mach-spear6xx/include/mach/misc_regs.h
Resolve even more merge conflicts.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear6xx/include/mach/misc_regs.h')
| -rw-r--r-- | arch/arm/mach-spear6xx/include/mach/misc_regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-spear6xx/include/mach/misc_regs.h b/arch/arm/mach-spear6xx/include/mach/misc_regs.h index 633074fddf9a..179e45774b3a 100644 --- a/arch/arm/mach-spear6xx/include/mach/misc_regs.h +++ b/arch/arm/mach-spear6xx/include/mach/misc_regs.h @@ -14,9 +14,9 @@ #ifndef __MACH_MISC_REGS_H #define __MACH_MISC_REGS_H -#include <mach/hardware.h> #include <mach/spear.h> #define MISC_BASE IOMEM(VA_SPEAR6XX_ICM3_MISC_REG_BASE) +#define DMA_CHN_CFG (MISC_BASE + 0x0A0) #endif /* __MACH_MISC_REGS_H */ |