From: Greg Ungerer Date: Tue, 16 Oct 2007 08:26:30 +0000 (-0700) Subject: M68KNOMMU: remove unused config symbol CONFIG_DISKtel X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fabc7f66ee022ff6e27ba25aafb237996f440536;p=linux-beck.git M68KNOMMU: remove unused config symbol CONFIG_DISKtel Remove unused config symbol CONFIG_DISKtel. Pointed out by Robert P. J. Day . Signed-off-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h index 5da43a5d12a3..1bd1142685e1 100644 --- a/include/asm-m68knommu/system.h +++ b/include/asm-m68knommu/system.h @@ -253,8 +253,7 @@ cmpxchg(volatile int *p, int old, int new) "); \ }) #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; \