[src/trunk]: src/sys/arch/arm32 Remove another spurious #ifdef CPU_ARM7500.

[bjh21 <bjh21%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/902d2de7fd45
branches:  trunk
changeset: 512329:902d2de7fd45
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Mon Jul 09 23:35:58 2001 +0000

description:
Remove another spurious #ifdef CPU_ARM7500.

diffstat:

 sys/arch/arm32/iomd/iomd.c |  4 +---
 sys/arch/arm32/vidc/beep.c |  6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r 763a0ba63aad -r 902d2de7fd45 sys/arch/arm32/iomd/iomd.c
--- a/sys/arch/arm32/iomd/iomd.c        Mon Jul 09 23:35:56 2001 +0000
+++ b/sys/arch/arm32/iomd/iomd.c        Mon Jul 09 23:35:58 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iomd.c,v 1.12 2001/07/09 21:46:19 reinoud Exp $        */
+/*     $NetBSD: iomd.c,v 1.13 2001/07/09 23:42:18 bjh21 Exp $  */
 
 /*
  * Copyright (c) 1996-1997 Mark Brinicombe.
@@ -288,7 +288,6 @@
        config_found(self, &ia, iomdprint);
 
        switch (sc->sc_id) {
-#ifdef CPU_ARM7500
        case ARM7500_IOC_ID:
        case ARM7500FE_IOC_ID:
                /* Attach pms device */
@@ -300,7 +299,6 @@
                ia.ia_pms.pa_irq = IRQ_MSDRX;
                config_found(self, &ia, iomdprint);
                break;
-#endif /* CPU_ARM7500 */
        case RPC600_IOMD_ID:
                /* Attach (ws)qms device */
 
diff -r 763a0ba63aad -r 902d2de7fd45 sys/arch/arm32/vidc/beep.c
--- a/sys/arch/arm32/vidc/beep.c        Mon Jul 09 23:35:56 2001 +0000
+++ b/sys/arch/arm32/vidc/beep.c        Mon Jul 09 23:35:58 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: beep.c,v 1.24 2001/07/09 21:46:21 reinoud Exp $        */
+/*     $NetBSD: beep.c,v 1.25 2001/07/09 23:35:58 bjh21 Exp $  */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe
@@ -42,8 +42,6 @@
  *
  */
 
-#include "opt_cputypes.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -114,12 +112,10 @@
 
        /* So far I only know about this IOMD */
        switch (id) {
-#ifdef CPU_ARM7500
        case ARM7500_IOC_ID:
        case ARM7500FE_IOC_ID:
                sdma_channel = IRQ_SDMA;
                return(1);
-#endif
        case RPC600_IOMD_ID:
                sdma_channel = IRQ_DMASCH0;
                return(1);