diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2007-10-16 04:26:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:03 -0400 |
| commit | fabc7f66ee022ff6e27ba25aafb237996f440536 (patch) | |
| tree | e993645185648780e8f2738c26c21fe8200699fc /include/asm-m68knommu | |
| parent | a2e170ea879ab2b4330476ec845cc22dc8ee1821 (diff) | |
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.h | 3 |
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) | |||
| 253 | "); \ | 253 | "); \ |
| 254 | }) | 254 | }) |
| 255 | #elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \ | 255 | #elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \ |
| 256 | defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \ | 256 | defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) |
| 257 | defined(CONFIG_CLEOPATRA) | ||
| 258 | #define HARD_RESET_NOW() ({ \ | 257 | #define HARD_RESET_NOW() ({ \ |
| 259 | asm(" \ | 258 | asm(" \ |
| 260 | movew #0x2700, %sr; \ | 259 | movew #0x2700, %sr; \ |