summaryrefslogtreecommitdiff
path: root/sys/dev/cardbus/ohci_cardbus.c
diff options
context:
space:
mode:
authorFelix Kronlage <fkr@cvs.openbsd.org>2006-06-21 11:27:04 +0000
committerFelix Kronlage <fkr@cvs.openbsd.org>2006-06-21 11:27:04 +0000
commit352c8b1d9301b87bb083059ee15e22c56b05486a (patch)
tree4f68cef0c815f080ce55b31a0616c587abe4b69a /sys/dev/cardbus/ohci_cardbus.c
parent834b1d43c7a47e7cb72960feacca338f86a433ef (diff)
removal of '#ifdef rbus ... #else ...' directives, we use rbus in all
cases anyways, so we might as well remove code (the !rbus case) thats been dead throughout the last years and just use the rbus code without ifdefs. brad, miod "I am all for this diff" ok deraadt, mickey
Diffstat (limited to 'sys/dev/cardbus/ohci_cardbus.c')
-rw-r--r--sys/dev/cardbus/ohci_cardbus.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index 598640d37e1..8e9e215d903 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci_cardbus.c,v 1.5 2006/05/22 15:58:00 dlg Exp $ */
+/* $OpenBSD: ohci_cardbus.c,v 1.6 2006/06/21 11:27:03 fkr Exp $ */
/* $NetBSD: ohci_cardbus.c,v 1.19 2004/08/02 19:14:28 mycroft Exp $ */
/*
@@ -129,10 +129,6 @@ ohci_cardbus_attach(struct device *parent, struct device *self, void *aux)
sc->sc_ct = ct;
sc->sc.sc_bus.dmatag = ca->ca_dmat;
-#if rbus
-#else
-XXX (ct->ct_cf->cardbus_mem_open)(cc, 0, iob, iob + 0x40);
-#endif
(ct->ct_cf->cardbus_ctrl)(cc, CARDBUS_MEM_ENABLE);
(ct->ct_cf->cardbus_ctrl)(cc, CARDBUS_BM_ENABLE);