diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
| commit | 8b3f6af86378d0a10ca2f1ded1da124aef13b62c (patch) | |
| tree | de6ca90295730343c495be8d98be8efa322140ef /arch/arm/plat-mxc/include/mach/board-mx21ads.h | |
| parent | 139d6065c83071d5f66cd013a274a43699f8e2c1 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpc-usb/TODO
drivers/staging/cpc-usb/cpc-usb_drv.c
drivers/staging/cpc-usb/cpc.h
drivers/staging/cpc-usb/cpc_int.h
drivers/staging/cpc-usb/cpcusb.h
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/board-mx21ads.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/board-mx21ads.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/plat-mxc/include/mach/board-mx21ads.h b/arch/arm/plat-mxc/include/mach/board-mx21ads.h index 06701df74c42..0cf4fa29510c 100644 --- a/arch/arm/plat-mxc/include/mach/board-mx21ads.h +++ b/arch/arm/plat-mxc/include/mach/board-mx21ads.h | |||
| @@ -15,12 +15,6 @@ | |||
| 15 | #define __ASM_ARCH_MXC_BOARD_MX21ADS_H__ | 15 | #define __ASM_ARCH_MXC_BOARD_MX21ADS_H__ |
| 16 | 16 | ||
| 17 | /* | 17 | /* |
| 18 | * MXC UART EVB board level configurations | ||
| 19 | */ | ||
| 20 | #define MXC_LL_UART_PADDR UART1_BASE_ADDR | ||
| 21 | #define MXC_LL_UART_VADDR AIPI_IO_ADDRESS(UART1_BASE_ADDR) | ||
| 22 | |||
| 23 | /* | ||
| 24 | * Memory-mapped I/O on MX21ADS base board | 18 | * Memory-mapped I/O on MX21ADS base board |
| 25 | */ | 19 | */ |
| 26 | #define MX21ADS_MMIO_BASE_ADDR 0xF5000000 | 20 | #define MX21ADS_MMIO_BASE_ADDR 0xF5000000 |