Fixup some problems with the merged code of the previous commit.
This commit is contained in:
parent
232b06012c
commit
3a173aeeb3
@ -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}
|
||||
|
@ -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
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user