diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 10:56:55 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 10:56:55 +0200 |
commit | 1e2697b1ce312f76ecc70051b9298317a4f1f944 (patch) | |
tree | cbc4c2e87ce6270e6b0f7369a1d968cdf088d937 /include/asm-mips/lasat/serial.h | |
parent | 37aab38972a2dd971f52a01533c0678a0646294b (diff) | |
parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) |
Merge branch 'linus' into kmemchecktip-kmemcheck-2008-06-23_08.59_Mon
Diffstat (limited to 'include/asm-mips/lasat/serial.h')
-rw-r--r-- | include/asm-mips/lasat/serial.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/lasat/serial.h b/include/asm-mips/lasat/serial.h index bafe68b10614..1c37d70579b8 100644 --- a/include/asm-mips/lasat/serial.h +++ b/include/asm-mips/lasat/serial.h @@ -4,10 +4,10 @@ #define LASAT_BASE_BAUD_100 (7372800 / 16) #define LASAT_UART_REGS_BASE_100 0x1c8b0000 #define LASAT_UART_REGS_SHIFT_100 2 -#define LASATINT_UART_100 8 +#define LASATINT_UART_100 16 /* * LASAT 200 boards serial configuration */ #define LASAT_BASE_BAUD_200 (100000000 / 16 / 12) #define LASAT_UART_REGS_BASE_200 (Vrc5074_PHYS_BASE + 0x0300) #define LASAT_UART_REGS_SHIFT_200 3 -#define LASATINT_UART_200 13 +#define LASATINT_UART_200 21 |