From 4de0598e28716a0410aa44eba7755fcc522a59f6 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Fri, 1 Feb 2008 17:38:26 +1000 Subject: [PATCH] --- yaml --- r: 81802 b: refs/heads/master c: f6efaf62bbb67ad564862a1131c365c3c55f6242 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-m68knommu/mcfuart.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e8b14f086b7a..7737ec679d26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7dcf7fe7c3060db38fc625efffad5965a5c6d8a +refs/heads/master: f6efaf62bbb67ad564862a1131c365c3c55f6242 diff --git a/trunk/include/asm-m68knommu/mcfuart.h b/trunk/include/asm-m68knommu/mcfuart.h index 873d0805219c..1319a81814b1 100644 --- a/trunk/include/asm-m68knommu/mcfuart.h +++ b/trunk/include/asm-m68knommu/mcfuart.h @@ -12,7 +12,6 @@ #define mcfuart_h /****************************************************************************/ - /* * Define the base address of the UARTS within the MBAR address * space. @@ -33,7 +32,7 @@ #define MCFUART_BASE2 0x240 /* Base address of UART2 */ #define MCFUART_BASE3 0x280 /* Base address of UART3 */ #elif defined(CONFIG_M5249) || defined(CONFIG_M5307) || defined(CONFIG_M5407) -#if defined(CONFIG_NETtel) || defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) +#if defined(CONFIG_NETtel) || defined(CONFIG_SECUREEDGEMP3) #define MCFUART_BASE1 0x200 /* Base address of UART1 */ #define MCFUART_BASE2 0x1c0 /* Base address of UART2 */ #else