From 3ba9161ab228484527cc5f650958ed76bbf8a8b3 Mon Sep 17 00:00:00 2001
From: msaitoh <msaitoh@NetBSD.org>
Date: Wed, 8 Nov 2000 01:03:03 +0000
Subject: [PATCH] check whether SH4_PCMCIA is defined or not. fixes PR. 11441.

---
 sys/arch/sh3/sh3/trap.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/arch/sh3/sh3/trap.c b/sys/arch/sh3/sh3/trap.c
index 98d59cac1025..8c6b2c5a3801 100644
--- a/sys/arch/sh3/sh3/trap.c
+++ b/sys/arch/sh3/sh3/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.19 2000/09/08 19:52:13 msaitoh Exp $	*/
+/*	$NetBSD: trap.c,v 1.20 2000/11/08 01:03:03 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -663,6 +663,7 @@ tlb_handler(p1, p2, p3, p4, frame)
 #define PTEL_VALIDBITS 0x1ffffd7e
 #endif
 #ifdef SH4
+#ifdef SH4_PCMCIA
 			if (pte & PG_PCMCIA) {
 				int pcmtype;
 				unsigned long ptea = 0;
@@ -685,7 +686,9 @@ tlb_handler(p1, p2, p3, p4, frame)
 					& ~PG_N;
 
 				SHREG_PTEA = ptea;
-			} else {
+			} else
+#endif
+			{
 				if ( /*1 ||*/ (va >= SH3_P1SEG_BASE)) {
 					SHREG_PTEL = (pte & PTEL_VALIDBITS)
 						| PG_WT;
@@ -819,6 +822,7 @@ tlb_handler(p1, p2, p3, p4, frame)
 #endif
 
 #ifdef SH4
+#ifdef SH4_PCMCIA
 				if (pte & PG_PCMCIA) {
 					int pcmtype;
 					unsigned long ptea = 0;
@@ -841,7 +845,9 @@ tlb_handler(p1, p2, p3, p4, frame)
 						& ~PG_N;
 
 					SHREG_PTEA = ptea;
-				} else {
+				} else
+#endif
+				{
 					if ( /*1 ||*/ (va >= SH3_P1SEG_BASE)) {
 						SHREG_PTEL = 
 							(pte & PTEL_VALIDBITS)