: remove use of undefined symbol CONFIG_DISKtel
Remove use of undefined symbol CONFIG_DISKtel.
Signed-off-by Greg Ungerer <[email protected]>
---
include/asm-m68knommu/mcfuart.h +1 -2
@@ -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
include/asm-m68knommu/system.h +1 -2
@@ -253,8 +253,7 @@ cmpxchg(volatile int *p, int old, int ne "); \ })#elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \ - defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3 ) || \ - defined(CONFIG_CLEOPATRA ) + defined(CONFIG_SECUREEDGEMP3 ) || defined(CONFIG_CLEOPATRA )#define HARD_RESET_NOW () ({ \ asm(" \ movew #0x2700, %sr; \