Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / ppc / syslib / ppc85xx_setup.h

diff --git a/arch/ppc/syslib/ppc85xx_setup.h b/arch/ppc/syslib/ppc85xx_setup.h
index 311b8a4..6ff7999 100644 (file)
--- a/arch/ppc/syslib/ppc85xx_setup.h
+++ b/arch/ppc/syslib/ppc85xx_setup.h
@@ -1,9 +1,7 @@
 /*
- * arch/ppc/syslib/ppc85xx_setup.h
- *
  * MPC85XX common board definitions
  *
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
+ * Maintainer: Kumar Gala <galak@kernel.crashing.org>
  *
  * Copyright 2004 Freescale Semiconductor Inc.
  *
@@ -17,8 +15,6 @@
 #ifndef __PPC_SYSLIB_PPC85XX_SETUP_H
 #define __PPC_SYSLIB_PPC85XX_SETUP_H
 
-#include <linux/config.h>
-#include <linux/serial.h>
 #include <linux/init.h>
 #include <asm/ppcboot.h>
 
@@ -44,22 +40,15 @@ extern void mpc85xx_setup_hose(void) __init;
 #define PCIX_STATUS    0x64
 
 /* Serial Config */
-#define MPC85XX_0_SERIAL                (CCSRBAR + 0x4500)
-#define MPC85XX_1_SERIAL                (CCSRBAR + 0x4600)
-
 #ifdef CONFIG_SERIAL_MANY_PORTS
 #define RS_TABLE_SIZE  64
 #else
 #define RS_TABLE_SIZE  2
 #endif
 
-#define BASE_BAUD 0
-
-#define STD_UART_OP(num)                                       \
-       { 0, BASE_BAUD, num, MPC85xx_IRQ_DUART,                 \
-               (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST),        \
-               iomem_base: (u8 *)MPC85XX_##num##_SERIAL,       \
-               io_type: SERIAL_IO_MEM},
+#ifndef BASE_BAUD
+#define BASE_BAUD 115200
+#endif
 
 /* Offset of CPM register space */
 #define CPM_MAP_ADDR   (CCSRBAR + MPC85xx_CPM_OFFSET)