aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-m68knommu/mcfuart.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2008-02-01 02:38:26 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-01 05:00:01 -0500
commitf6efaf62bbb67ad564862a1131c365c3c55f6242 (patch)
treea5d4a5e89dd053cbe1f009377d12c046d2e9de80 /include/asm-m68knommu/mcfuart.h
parentb7dcf7fe7c3060db38fc625efffad5965a5c6d8a (diff)
m68knommu: remove unused CONFIG_DISKtel symbol
Remove unused CONFIG_DISKtel define. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-m68knommu/mcfuart.h')
-rw-r--r--include/asm-m68knommu/mcfuart.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-m68knommu/mcfuart.h b/include/asm-m68knommu/mcfuart.h
index 873d0805219c..1319a81814b1 100644
--- a/include/asm-m68knommu/mcfuart.h
+++ b/include/asm-m68knommu/mcfuart.h
@@ -12,7 +12,6 @@
12#define mcfuart_h 12#define mcfuart_h
13/****************************************************************************/ 13/****************************************************************************/
14 14
15
16/* 15/*
17 * Define the base address of the UARTS within the MBAR address 16 * Define the base address of the UARTS within the MBAR address
18 * space. 17 * space.
@@ -33,7 +32,7 @@
33#define MCFUART_BASE2 0x240 /* Base address of UART2 */ 32#define MCFUART_BASE2 0x240 /* Base address of UART2 */
34#define MCFUART_BASE3 0x280 /* Base address of UART3 */ 33#define MCFUART_BASE3 0x280 /* Base address of UART3 */
35#elif defined(CONFIG_M5249) || defined(CONFIG_M5307) || defined(CONFIG_M5407) 34#elif defined(CONFIG_M5249) || defined(CONFIG_M5307) || defined(CONFIG_M5407)
36#if defined(CONFIG_NETtel) || defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) 35#if defined(CONFIG_NETtel) || defined(CONFIG_SECUREEDGEMP3)
37#define MCFUART_BASE1 0x200 /* Base address of UART1 */ 36#define MCFUART_BASE1 0x200 /* Base address of UART1 */
38#define MCFUART_BASE2 0x1c0 /* Base address of UART2 */ 37#define MCFUART_BASE2 0x1c0 /* Base address of UART2 */
39#else 38#else