diff options
author | imp <imp@FreeBSD.org> | 2005-01-11 07:34:13 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2005-01-11 07:34:13 +0000 |
commit | 63ced9b235017eb23882751a80aa345b4e4cf075 (patch) | |
tree | f71488883fb1e77775541cb7ebc8cbdc20218ebb | |
parent | 7787203afc8be3364996edf42b97464030748daf (diff) | |
download | FreeBSD-src-63ced9b235017eb23882751a80aa345b4e4cf075.zip FreeBSD-src-63ced9b235017eb23882751a80aa345b4e4cf075.tar.gz |
MFp4:
sc_child isn't used on FreeBSD, so ifdef it out in a way that is
NetBSD mergeable.
-rw-r--r-- | sys/dev/usb/ehcivar.h | 3 | ||||
-rw-r--r-- | sys/dev/usb/ohcivar.h | 2 | ||||
-rw-r--r-- | sys/dev/usb/uhcivar.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/usb/ehcivar.h b/sys/dev/usb/ehcivar.h index 7859646..0639b70 100644 --- a/sys/dev/usb/ehcivar.h +++ b/sys/dev/usb/ehcivar.h @@ -146,8 +146,9 @@ typedef struct ehci_softc { usb_callout_t sc_tmo_pcd; +#if defined(__NetBSD__) || defined(__OpenBSD__) device_ptr_t sc_child; /* /dev/usb# device */ - +#endif char sc_dying; } ehci_softc_t; diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h index f9b0517..478bcea 100644 --- a/sys/dev/usb/ohcivar.h +++ b/sys/dev/usb/ohcivar.h @@ -147,7 +147,9 @@ typedef struct ohci_softc { usb_callout_t sc_tmo_rhsc; +#if defined(__NetBSD__) || defined(__OpenBSD__) device_ptr_t sc_child; +#endif char sc_dying; } ohci_softc_t; diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h index 2ba9d6f..80dba66 100644 --- a/sys/dev/usb/uhcivar.h +++ b/sys/dev/usb/uhcivar.h @@ -193,7 +193,9 @@ typedef struct uhci_softc { void *sc_shutdownhook; /* cookie from shutdown hook */ #endif +#if defined(__NetBSD__) || defined(__OpenBSD__) device_ptr_t sc_child; /* /dev/usb# device */ +#endif } uhci_softc_t; usbd_status uhci_init(uhci_softc_t *); |