From 9d6619f2e6db7c2ff8dca24de56a25af22a1bd3c Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Tue, 15 Jan 2008 21:55:24 +0000
Subject: [PATCH] Remove ricoh hack; FreeBSD does not seem to do it, and it was
 a remnant from the branch. Things should work properly now.

---
 sys/dev/pci/pccbb.c    | 17 ++---------------
 sys/dev/pci/pccbbvar.h |  4 +---
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index ebc18c15a898..195ad6f09ab5 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pccbb.c,v 1.162 2008/01/14 06:12:13 dyoung Exp $	*/
+/*	$NetBSD: pccbb.c,v 1.163 2008/01/15 21:55:24 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.162 2008/01/14 06:12:13 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.163 2008/01/15 21:55:24 christos Exp $");
 
 /*
 #define CBB_DEBUG
@@ -3308,13 +3308,6 @@ pccbb_suspend(device_t dv)
 	bus_space_write_4(base_memt, base_memh, CB_SOCKET_MASK, reg);
 	/* XXX joerg Disable power to the socket? */
 
-#ifdef __NO_STRICT_ALIGNMENT
-	/* XXX - the register is at 0x82, so this access is not valid */
-	if (sc->sc_chipset == CB_RX5C47X)
-		sc->sc_ricoh_misc_ctrl = pci_conf_read(sc->sc_pc,
-		     sc->sc_tag, RICOH_PCI_MISC_CTRL);
-#endif
-
 	return true;
 }
 
@@ -3330,12 +3323,6 @@ pccbb_resume(device_t dv)
 	/* setup memory and io space window for CB */
 	pccbb_winset(0x1000, sc, sc->sc_memt);
 	pccbb_winset(0x04, sc, sc->sc_iot);
-#ifdef __NO_STRICT_ALIGNMENT
-	/* XXX - the register is at 0x82, so this access is not valid */
-	if (sc->sc_chipset == CB_RX5C47X)
-		pci_conf_write(sc->sc_pc, sc->sc_tag,
-		    RICOH_PCI_MISC_CTRL, sc->sc_ricoh_misc_ctrl);
-#endif
 
 	/* CSC Interrupt: Card detect interrupt on */
 	reg = bus_space_read_4(base_memt, base_memh, CB_SOCKET_MASK);
diff --git a/sys/dev/pci/pccbbvar.h b/sys/dev/pci/pccbbvar.h
index 964f31b68a87..9b04f972389c 100644
--- a/sys/dev/pci/pccbbvar.h
+++ b/sys/dev/pci/pccbbvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pccbbvar.h,v 1.32 2008/01/14 06:12:13 dyoung Exp $	*/
+/*	$NetBSD: pccbbvar.h,v 1.33 2008/01/15 21:55:24 christos Exp $	*/
 /*
  * Copyright (c) 1999 HAYAKAWA Koichi.  All rights reserved.
  *
@@ -154,8 +154,6 @@ struct pccbb_softc {
 	/* interrupt handler list on the bridge */
 	LIST_HEAD(, pccbb_intrhand_list) sc_pil;
 	int sc_pil_intr_enable;	/* can i call intr handler for child device? */
-
-	pcireg_t sc_ricoh_misc_ctrl;
 };
 
 /*