Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-drm-fsl-dcu.git] / include / asm-m68knommu / mcfuart.h

diff --git a/include/asm-m68knommu/mcfuart.h b/include/asm-m68knommu/mcfuart.h
index b016fad83119a9b7cdfea60b51dd59a9ee43fc6f..dc0146c5258b745bc3ebf094029626dfbf35eaaa 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
@@ -45,6 +44,10 @@
 #define MCFUART_BASE1          0x60000         /* Base address of UART1 */
 #define MCFUART_BASE2          0x64000         /* Base address of UART2 */
 #define MCFUART_BASE3          0x68000         /* Base address of UART2 */
+#elif defined(CONFIG_M532x)
+#define MCFUART_BASE1          0xfc060000      /* Base address of UART1 */
+#define MCFUART_BASE2          0xfc064000      /* Base address of UART2 */
+#define MCFUART_BASE3          0xfc068000      /* Base address of UART3 */
 #endif