From: Greg Ungerer Date: Fri, 1 Feb 2008 07:38:26 +0000 (+1000) Subject: m68knommu: remove unused CONFIG_DISKtel symbol X-Git-Tag: v2.6.25-rc1~1098 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f6efaf62bbb67ad564862a1131c365c3c55f6242;p=linux-2.6-omap-h63xx.git m68knommu: remove unused CONFIG_DISKtel symbol Remove unused CONFIG_DISKtel define. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds --- diff --git a/include/asm-m68knommu/mcfuart.h b/include/asm-m68knommu/mcfuart.h index 873d0805219..1319a81814b 100644 --- a/include/asm-m68knommu/mcfuart.h +++ b/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