Merge branch 'linus' into oprofile-v2

Conflicts:
	arch/x86/kernel/apic_32.c
	arch/x86/oprofile/nmi_int.c
	include/linux/pci_ids.h

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/mips/include/asm/lasat/serial.h b/arch/mips/include/asm/lasat/serial.h
new file mode 100644
index 000000000000..1c37d70579b8
--- /dev/null
+++ b/arch/mips/include/asm/lasat/serial.h
@@ -0,0 +1,13 @@
+#include <asm/lasat/lasat.h>
+
+/* Lasat 100 boards serial configuration */
+#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               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               21