summaryrefslogtreecommitdiffstats
path: root/include/asm-m68knommu
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2007-10-16 01:26:30 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 09:43:03 -0700
commitfabc7f66ee022ff6e27ba25aafb237996f440536 (patch)
treee993645185648780e8f2738c26c21fe8200699fc /include/asm-m68knommu
parenta2e170ea879ab2b4330476ec845cc22dc8ee1821 (diff)
downloadlinux-fabc7f66ee022ff6e27ba25aafb237996f440536.tar.gz
linux-fabc7f66ee022ff6e27ba25aafb237996f440536.tar.bz2
linux-fabc7f66ee022ff6e27ba25aafb237996f440536.zip
M68KNOMMU: remove unused config symbol CONFIG_DISKtel
Remove unused config symbol CONFIG_DISKtel. Pointed out by Robert P. J. Day <rpjday@mindspring.com>. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-m68knommu')
-rw-r--r--include/asm-m68knommu/system.h3
1 files changed, 1 insertions, 2 deletions
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; \