diff options
| author | Felix Kronlage <fkr@cvs.openbsd.org> | 2006-06-21 11:27:04 +0000 |
|---|---|---|
| committer | Felix Kronlage <fkr@cvs.openbsd.org> | 2006-06-21 11:27:04 +0000 |
| commit | 352c8b1d9301b87bb083059ee15e22c56b05486a (patch) | |
| tree | 4f68cef0c815f080ce55b31a0616c587abe4b69a /sys/dev/cardbus/if_rtw_cardbus.c | |
| parent | 834b1d43c7a47e7cb72960feacca338f86a433ef (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/if_rtw_cardbus.c')
| -rw-r--r-- | sys/dev/cardbus/if_rtw_cardbus.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c index b6487b630d4..5ab049f07e1 100644 --- a/sys/dev/cardbus/if_rtw_cardbus.c +++ b/sys/dev/cardbus/if_rtw_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtw_cardbus.c,v 1.9 2005/09/08 12:44:56 jsg Exp $ */ +/* $OpenBSD: if_rtw_cardbus.c,v 1.10 2006/06/21 11:27:03 fkr Exp $ */ /* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */ /*- @@ -237,10 +237,6 @@ rtw_cardbus_attach(struct device *parent, struct device *self, void *aux) RTW_DPRINTF(RTW_DEBUG_ATTACH, ("%s: %s mapped %lu bytes mem space\n", sc->sc_dev.dv_xname, __func__, (long)csc->sc_mapsize)); -#if rbus -#else - (*ct->ct_cf->cardbus_mem_open)(cc, 0, adr, adr+csc->sc_mapsize); -#endif csc->sc_cben = CARDBUS_MEM_ENABLE; csc->sc_csr |= CARDBUS_COMMAND_MEM_ENABLE; csc->sc_bar_reg = RTW_PCI_MMBA; @@ -251,10 +247,6 @@ rtw_cardbus_attach(struct device *parent, struct device *self, void *aux) RTW_DPRINTF(RTW_DEBUG_ATTACH, ("%s: %s mapped %lu bytes I/O space\n", sc->sc_dev.dv_xname, __func__, (long)csc->sc_mapsize)); -#if rbus -#else - (*ct->ct_cf->cardbus_io_open)(cc, 0, adr, adr+csc->sc_mapsize); -#endif csc->sc_cben = CARDBUS_IO_ENABLE; csc->sc_csr |= CARDBUS_COMMAND_IO_ENABLE; csc->sc_bar_reg = RTW_PCI_IOBA; |