diff options
| author | joerg <joerg@FreeBSD.org> | 1997-01-17 23:54:45 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 1997-01-17 23:54:45 +0000 |
| commit | 14cfba618c3dd1fe8025d11f956ade25ad77120f (patch) | |
| tree | a4f5eddb9b3bd12e23dcdc7e486d3c75a0f4e6f5 /sys/dev/pdq/pdq_ifsubr.c | |
| parent | 912bcfa966638919ab4759ca32c659243a368883 (diff) | |
| download | FreeBSD-src-14cfba618c3dd1fe8025d11f956ade25ad77120f.zip FreeBSD-src-14cfba618c3dd1fe8025d11f956ade25ad77120f.tar.gz | |
This mega-merge brings Matt Thomas' 960801 FDDI driver (almost) up
to -current.
Thanks goes to Ulrike Nitzsche <ulrike@ifw-dresden.de> for giving me
a chance to test this. Only the PCI driver is tested though.
One final patch will follow in a separate commit. This is so that
everything up to here can be dragged into 2.2, if we decide so.
Reviewed by: joerg
Submitted by: Matt Thomas <matt@3am-software.com>
Diffstat (limited to 'sys/dev/pdq/pdq_ifsubr.c')
| -rw-r--r-- | sys/dev/pdq/pdq_ifsubr.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c index 224e4e8..b6223fb 100644 --- a/sys/dev/pdq/pdq_ifsubr.c +++ b/sys/dev/pdq/pdq_ifsubr.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pdq_ifsubr.c,v 1.8 1996/07/31 21:38:44 thomas Exp $ + * $Id: pdq_ifsubr.c,v 1.1.1.1 1997/01/17 23:19:49 joerg Exp $ * */ @@ -41,9 +41,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/malloc.h> -#if defined(__FreeBSD__) -#include <sys/devconf.h> -#elif defined(__bsdi__) || defined(__NetBSD__) +#if defined(__bsdi__) || defined(__NetBSD__) #include <sys/device.h> #endif @@ -84,8 +82,13 @@ #include <vm/vm_kern.h> #include <vm/vm_param.h> +#if defined(__FreeBSD__) +#include <dev/pdq/pdqvar.h> +#include <dev/pdq/pdqreg.h> +#else #include "pdqvar.h" #include "pdqreg.h" +#endif #if defined(__bsdi__) && _BSDI_VERSION < 199506 /* XXX */ static void |
