aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Saab <ps@FreeBSD.org>2006-04-10 20:04:22 +0000
committerPaul Saab <ps@FreeBSD.org>2006-04-10 20:04:22 +0000
commitd8636a9ab749556811c52d47fc054f5f1c957a3e (patch)
tree689293e4460d44324affc45df608fd131110233b
parent6caf734fd926903303e5384ca06012c63350e5cc (diff)
Notes
-rw-r--r--share/man/man4/Makefile1
-rw-r--r--sys/amd64/conf/GENERIC1
-rw-r--r--sys/conf/files1
-rw-r--r--sys/conf/options3
-rw-r--r--sys/dev/bce/if_bce.c2
-rw-r--r--sys/i386/conf/GENERIC1
6 files changed, 9 insertions, 0 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 89d4e871d91f1..49541fc1643b7 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -31,6 +31,7 @@ MAN= aac.4 \
aue.4 \
awi.4 \
axe.4 \
+ bce.4 \
bfe.4 \
bge.4 \
bktr.4 \
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index b60edb9719344..53fbedc43e9e7 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -192,6 +192,7 @@ device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device miibus # MII bus support
+device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
device bfe # Broadcom BCM440x 10/100 Ethernet
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
diff --git a/sys/conf/files b/sys/conf/files
index 121155ceac22f..985d8e6bda837 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -475,6 +475,7 @@ dev/ath/if_ath_pci.c optional ath pci \
dev/awi/am79c930.c optional awi
dev/awi/awi.c optional awi
dev/awi/if_awi_pccard.c optional awi pccard
+dev/bce/if_bce.c optional bce
dev/bfe/if_bfe.c optional bfe
dev/bge/if_bge.c optional bge
dev/bktr/bktr_audio.c optional bktr pci
diff --git a/sys/conf/options b/sys/conf/options
index 5d4347c62c561..a775e3f55e4cd 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -634,6 +634,9 @@ ED_HPP opt_ed.h
ED_3C503 opt_ed.h
ED_SIC opt_ed.h
+# bce driver
+BCE_DEBUG opt_bce.h
+
# bge driver
BGE_FAKE_AUTONEG opt_bge.h
diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
index c961a6db1348a..571b3a65c9e9c 100644
--- a/sys/dev/bce/if_bce.c
+++ b/sys/dev/bce/if_bce.c
@@ -45,6 +45,8 @@ __FBSDID("$FreeBSD$");
* BCM5708S A0, B0, B1
*/
+#include "opt_bce.h"
+
#include <dev/bce/if_bcereg.h>
#include <dev/bce/if_bcefw.h>
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index f6e8671a05076..f98fe6b05bacd 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -204,6 +204,7 @@ device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device miibus # MII bus support
+device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
device bfe # Broadcom BCM440x 10/100 Ethernet
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes