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.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.c')
| -rw-r--r-- | sys/dev/pdq/pdq.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c index ad0b5a7..e183726 100644 --- a/sys/dev/pdq/pdq.c +++ b/sys/dev/pdq/pdq.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.c,v 1.28 1996/07/31 21:38:44 thomas Exp $ + * $Id: pdq.c,v 1.1.1.1 1997/01/17 23:19:48 joerg Exp $ * */ @@ -39,8 +39,13 @@ #define PDQ_HWSUPPORT /* for pdq.h */ +#if defined(__FreeBSD__) +#include <dev/pdq/pdqvar.h> +#include <dev/pdq/pdqreg.h> +#else #include "pdqvar.h" #include "pdqreg.h" +#endif #define PDQ_ROUNDUP(n, x) (((n) + ((x) - 1)) & ~((x) - 1)) #define PDQ_CMD_RX_ALIGNMENT 16 |
