summaryrefslogtreecommitdiffstats
path: root/sys/dev/lnc
diff options
context:
space:
mode:
authorpaul <paul@FreeBSD.org>2000-12-16 01:41:14 +0000
committerpaul <paul@FreeBSD.org>2000-12-16 01:41:14 +0000
commit51b6b5a26a579cf4b05ead1150d2e2a1adbbe62d (patch)
treed5423dcc891b3256670ae2a0bf572c4fd3b55d81 /sys/dev/lnc
parent00fcc3d35ac764fd8deb0e9698adee70e7c6fb1a (diff)
downloadFreeBSD-src-51b6b5a26a579cf4b05ead1150d2e2a1adbbe62d.zip
FreeBSD-src-51b6b5a26a579cf4b05ead1150d2e2a1adbbe62d.tar.gz
Fixup some problems with the merged code of the previous commit.
Diffstat (limited to 'sys/dev/lnc')
-rw-r--r--sys/dev/lnc/if_lnc_isa.c3
-rw-r--r--sys/dev/lnc/if_lnc_pci.c2
-rw-r--r--sys/dev/lnc/if_lncvar.h4
3 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/lnc/if_lnc_isa.c b/sys/dev/lnc/if_lnc_isa.c
index 5c298d1..4732c51 100644
--- a/sys/dev/lnc/if_lnc_isa.c
+++ b/sys/dev/lnc/if_lnc_isa.c
@@ -49,7 +49,8 @@
#include <isa/isavar.h>
-#include <dev/lnc/if_lnc.h>
+#include <dev/lnc/if_lncvar.h>
+#include <dev/lnc/if_lncreg.h>
static struct isa_pnp_id lnc_pnp_ids[] = {
{0, NULL}
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index 7ef57d5..5dec50d 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -50,7 +50,7 @@
#include <pci/pcireg.h>
#include <pci/pcivar.h>
-#include <dev/lnc/if_lnc.h>
+#include <dev/lnc/if_lncvar.h>
#define AMD_VENDOR_ID 0x1022
#define PCI_DEVICE_ID_PCNet_PCI 0x2000
diff --git a/sys/dev/lnc/if_lncvar.h b/sys/dev/lnc/if_lncvar.h
index df205ea..8c50353 100644
--- a/sys/dev/lnc/if_lncvar.h
+++ b/sys/dev/lnc/if_lncvar.h
@@ -33,8 +33,6 @@
* $FreeBSD$
*/
-#include <dev/lnc/if_lncreg.h>
-
/*
* Initialize multicast address hashing registers to accept
* all multicasts (only used when in promiscuous mode)
@@ -117,7 +115,7 @@
#define Am79C970A 0x2621
#define Am79C971 0x2623
#define Am79C972 0x2624
-#define Am79C972 0x2625
+#define Am79C973 0x2625
#define Am79C978 0x2626
/* Board types */
OpenPOWER on IntegriCloud