diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 15:11:26 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 15:11:32 -0400 |
| commit | bbd771474ec44b516107685d77e1c80bbe09f141 (patch) | |
| tree | 0cb15781539a68f27b4ea6c89f827282630cbce6 /arch/arm/mach-davinci/include/mach/serial.h | |
| parent | 403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (diff) | |
| parent | 319b6ffc6df892e4ccffff823cc5521a4a5d2dca (diff) | |
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/serial.h')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/serial.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/arch/arm/mach-davinci/include/mach/serial.h index e347d88fef91..46b3cd11c3c2 100644 --- a/arch/arm/mach-davinci/include/mach/serial.h +++ b/arch/arm/mach-davinci/include/mach/serial.h | |||
| @@ -15,16 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | #include <mach/hardware.h> | 16 | #include <mach/hardware.h> |
| 17 | 17 | ||
| 18 | /* | ||
| 19 | * Stolen area that contains debug uart physical and virtual addresses. These | ||
| 20 | * addresses are filled in by the uncompress.h code, and are used by the debug | ||
| 21 | * macros in debug-macro.S. | ||
| 22 | * | ||
| 23 | * This area sits just below the page tables (see arch/arm/kernel/head.S). | ||
| 24 | * We define it as a relative offset from start of usable RAM. | ||
| 25 | */ | ||
| 26 | #define DAVINCI_UART_INFO_OFS 0x3ff8 | ||
| 27 | |||
| 28 | #define DAVINCI_UART0_BASE (IO_PHYS + 0x20000) | 18 | #define DAVINCI_UART0_BASE (IO_PHYS + 0x20000) |
| 29 | #define DAVINCI_UART1_BASE (IO_PHYS + 0x20400) | 19 | #define DAVINCI_UART1_BASE (IO_PHYS + 0x20400) |
| 30 | #define DAVINCI_UART2_BASE (IO_PHYS + 0x20800) | 20 | #define DAVINCI_UART2_BASE (IO_PHYS + 0x20800) |