diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-28 18:57:19 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-28 18:57:19 +0100 |
| commit | 255bae73b214f143a3c7cc74d4792eb166a10d46 (patch) | |
| tree | d1300649335dce44b038fc8d43f4510eb487405b /arch/arm/mach-dove/include/mach/dove.h | |
| parent | a737823d37666255e3e74ce84bc9611a038e0888 (diff) | |
| parent | dc7b602dd481cad61fc4f18874bbdc5b04b5ee3e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
Diffstat (limited to 'arch/arm/mach-dove/include/mach/dove.h')
| -rw-r--r-- | arch/arm/mach-dove/include/mach/dove.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/include/mach/dove.h b/arch/arm/mach-dove/include/mach/dove.h index e5fcdd3f5bf..b20ec9af788 100644 --- a/arch/arm/mach-dove/include/mach/dove.h +++ b/arch/arm/mach-dove/include/mach/dove.h @@ -136,7 +136,7 @@ #define DOVE_MPP_GENERAL_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0xe803c) #define DOVE_AU1_SPDIFO_GPIO_EN (1 << 1) #define DOVE_NAND_GPIO_EN (1 << 0) -#define DOVE_MPP_CTRL4_VIRT_BASE (DOVE_GPIO_VIRT_BASE + 0x40) +#define DOVE_MPP_CTRL4_VIRT_BASE (DOVE_GPIO_LO_VIRT_BASE + 0x40) #define DOVE_SPI_GPIO_SEL (1 << 5) #define DOVE_UART1_GPIO_SEL (1 << 4) #define DOVE_AU1_GPIO_SEL (1 << 3) |