Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[mv-sheeva.git] / include / asm-m68knommu / mcfuart.h

diff --git a/include/asm-m68knommu/mcfuart.h b/include/asm-m68knommu/mcfuart.h
index 9c1210613bc78ef925efff098196020b8b8d0857..8040e43786bebf37eba16da556b2c6d966db9411 100644 (file)
--- a/include/asm-m68knommu/mcfuart.h
+++ b/include/asm-m68knommu/mcfuart.h
@@ -12,7 +12,6 @@
 #define        mcfuart_h
 /****************************************************************************/
 
-#include <linux/config.h>
 
 /*
  *     Define the base address of the UARTS within the MBAR address
@@ -41,6 +40,10 @@
 #define MCFUART_BASE1          0x1c0           /* Base address of UART1 */
 #define MCFUART_BASE2          0x200           /* Base address of UART2 */
 #endif
+#elif defined(CONFIG_M520x)
+#define MCFUART_BASE1          0x60000         /* Base address of UART1 */
+#define MCFUART_BASE2          0x64000         /* Base address of UART2 */
+#define MCFUART_BASE3          0x68000         /* Base address of UART2 */
 #endif