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_rl_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_rl_cardbus.c')
| -rw-r--r-- | sys/dev/cardbus/if_rl_cardbus.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c index 7a7aa77919a..2b73ed846fc 100644 --- a/sys/dev/cardbus/if_rl_cardbus.c +++ b/sys/dev/cardbus/if_rl_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rl_cardbus.c,v 1.12 2006/06/17 17:58:17 brad Exp $ */ +/* $OpenBSD: if_rl_cardbus.c,v 1.13 2006/06/21 11:27:03 fkr Exp $ */ /* $NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $ */ /* @@ -170,10 +170,6 @@ rl_cardbus_attach(parent, self, aux) #ifdef RL_USEIOSPACE if (Cardbus_mapreg_map(ct, RL_PCI_LOIO, CARDBUS_MAPREG_TYPE_IO, 0, &sc->rl_btag, &sc->rl_bhandle, &adr, &csc->sc_mapsize) == 0) { -#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 = RL_PCI_LOIO; @@ -182,10 +178,6 @@ rl_cardbus_attach(parent, self, aux) #else if (Cardbus_mapreg_map(ct, RL_PCI_LOMEM, CARDBUS_MAPREG_TYPE_MEM, 0, &sc->rl_btag, &sc->rl_bhandle, &adr, &csc->sc_mapsize) == 0) { -#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 = RL_PCI_LOMEM; |