aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-m68knommu
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2008-02-01 17:38:26 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-01 21:00:01 +1100
commitf6efaf62bbb67ad564862a1131c365c3c55f6242 (patch)
treea5d4a5e89dd053cbe1f009377d12c046d2e9de80 /include/asm-m68knommu
parentb7dcf7fe7c3060db38fc625efffad5965a5c6d8a (diff)
downloadkernel_samsung_aries-f6efaf62bbb67ad564862a1131c365c3c55f6242.zip
kernel_samsung_aries-f6efaf62bbb67ad564862a1131c365c3c55f6242.tar.gz
kernel_samsung_aries-f6efaf62bbb67ad564862a1131c365c3c55f6242.tar.bz2
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')
-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 873d080..1319a81 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