From ba247415879d546ce8325bf256936a2c562e53b6 Mon Sep 17 00:00:00 2001
From: Michael Shalayeff <mickey@cvs.openbsd.org>
Date: Wed, 21 Jul 2004 19:55:31 +0000
Subject: remove hppa workarounds; from jkunz@ pr3861

---
 sys/dev/ic/siop_common.c      | 4 +---
 sys/dev/pci/siop_pci_common.c | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'sys')

diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index 8e565358e18..dcc68b79dde 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop_common.c,v 1.20 2004/06/12 22:22:26 krw Exp $ */
+/*	$OpenBSD: siop_common.c,v 1.21 2004/07/21 19:55:30 mickey Exp $ */
 /*	$NetBSD: siop_common.c,v 1.31 2002/09/27 15:37:18 provos Exp $	*/
 
 /*
@@ -268,10 +268,8 @@ siop_setuptables(siop_cmd)
 		*targ_flags &= TARF_DT; /* Save TARF_DT 'cuz we don't set it here */
 		quirks = xs->sc_link->quirks;
 
-#ifndef __hppa__
 		if ((quirks & SDEV_NOTAGS) == 0)
 			*targ_flags |= TARF_TAG;
-#endif
 		if (((quirks & SDEV_NOWIDE) == 0) &&
 		    (sc->features & SF_BUS_WIDE))
 			*targ_flags |= TARF_WIDE;
diff --git a/sys/dev/pci/siop_pci_common.c b/sys/dev/pci/siop_pci_common.c
index 815008d0a8d..cabdc5a5f6b 100644
--- a/sys/dev/pci/siop_pci_common.c
+++ b/sys/dev/pci/siop_pci_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop_pci_common.c,v 1.12 2003/10/09 17:41:00 mickey Exp $ */
+/*	$OpenBSD: siop_pci_common.c,v 1.13 2004/07/21 19:55:30 mickey Exp $ */
 /*	$NetBSD: siop_pci_common.c,v 1.17 2002/05/04 18:11:06 bouyer Exp $ */
 
 /*
@@ -234,10 +234,6 @@ siop_pci_attach_common(pci_sc, siop_sc, pa, intr)
 	}
 	/* copy interesting infos about the chip */
 	siop_sc->features = pci_sc->sc_pp->features;
-#ifdef __hppa__
-	/* XXX On board ram doesn't work (yet?) on hppa. */
-	siop_sc->features &= ~SF_CHIP_RAM;
-#endif
 #ifdef SIOP_SYMLED    /* XXX Should be a devprop! */
 	siop_sc->features |= SF_CHIP_LED0;
 #endif
-- 
cgit v1.2.3