diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 08:55:36 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 08:55:36 -0400 |
| commit | 6469f540ea37d53db089c8fea9c0c77a3d9353d4 (patch) | |
| tree | 1dc9dc077150d57f4424cae49e711b5dd6e903a1 /arch/arm/plat-mxc/include/mach/board-armadillo5x0.h | |
| parent | 304e6d5fe294b80e6d3107f99ec241816390ebcc (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Merged in order that I can apply the Nomadik nand/onenand support patches.
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/board-armadillo5x0.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/board-armadillo5x0.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/plat-mxc/include/mach/board-armadillo5x0.h b/arch/arm/plat-mxc/include/mach/board-armadillo5x0.h index 8769e910e559..0376c133c9f4 100644 --- a/arch/arm/plat-mxc/include/mach/board-armadillo5x0.h +++ b/arch/arm/plat-mxc/include/mach/board-armadillo5x0.h | |||
| @@ -12,11 +12,4 @@ | |||
| 12 | #ifndef __ASM_ARCH_MXC_BOARD_ARMADILLO5X0_H__ | 12 | #ifndef __ASM_ARCH_MXC_BOARD_ARMADILLO5X0_H__ |
| 13 | #define __ASM_ARCH_MXC_BOARD_ARMADILLO5X0_H__ | 13 | #define __ASM_ARCH_MXC_BOARD_ARMADILLO5X0_H__ |
| 14 | 14 | ||
| 15 | #include <mach/hardware.h> | ||
| 16 | |||
| 17 | /* mandatory for CONFIG_DEBUG_LL */ | ||
| 18 | |||
| 19 | #define MXC_LL_UART_PADDR UART1_BASE_ADDR | ||
| 20 | #define MXC_LL_UART_VADDR AIPS1_IO_ADDRESS(UART1_BASE_ADDR) | ||
| 21 | |||
| 22 | #endif | 15 | #endif |