diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2002-07-23 17:53:26 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2002-07-23 17:53:26 +0000 |
| commit | 0fb1bc586f74cf61c505b15732d944dcdc14e3ea (patch) | |
| tree | b02dddd8a24a4d956433f426e47c55ba85b18a66 /sys/dev | |
| parent | 5259b36f77648d82c08d84c6aac774d9f02d871c (diff) | |
Cardbus/pcmcia support for macppc. parts borrowed from NetBSD, and other
portions of the tree.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/audio_if.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/pccbb.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h index a21bf6bff1a..90ae5a7ef2d 100644 --- a/sys/dev/audio_if.h +++ b/sys/dev/audio_if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: audio_if.h,v 1.18 2002/05/30 20:28:31 mickey Exp $ */ +/* $OpenBSD: audio_if.h,v 1.19 2002/07/23 17:53:25 drahn Exp $ */ /* $NetBSD: audio_if.h,v 1.24 1998/01/10 14:07:25 tv Exp $ */ /* @@ -159,7 +159,7 @@ int audioprint(void *, const char *); #define ISDEVAUDIOCTL(x) (AUDIODEV((x)) == AUDIOCTL_DEVICE) #define ISDEVMIXER(x) (AUDIODEV((x)) == MIXER_DEVICE) -#if !defined(__i386__) && !defined(__sparc64__) +#if !defined(__i386__) && !defined(__sparc64__) && !defined(__powerpc__) #define splaudio splbio /* XXX */ #define IPL_AUDIO IPL_BIO /* XXX */ #endif diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index c49199c58ab..f3ecb3afc55 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.30 2002/03/14 03:16:06 millert Exp $ */ +/* $OpenBSD: pccbb.c,v 1.31 2002/07/23 17:53:25 drahn Exp $ */ /* $NetBSD: pccbb.c,v 1.42 2000/06/16 23:41:35 cgd Exp $ */ /* @@ -400,8 +400,8 @@ pccbbattach(parent, self, aux) TAILQ_INIT(&sc->sc_iowindow); #if rbus - sc->sc_rbus_iot = rbus_pccbb_parent_io(pa); - sc->sc_rbus_memt = rbus_pccbb_parent_mem(pa); + sc->sc_rbus_iot = rbus_pccbb_parent_io(self, pa); + sc->sc_rbus_memt = rbus_pccbb_parent_mem(self, pa); #endif /* rbus */ sc->sc_base_memh = 0; |