summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorjfv <jfv@FreeBSD.org>2008-04-02 22:00:36 +0000
committerjfv <jfv@FreeBSD.org>2008-04-02 22:00:36 +0000
commit9d514d84b92dc7bd134ec57eb7acb796a66a8dda (patch)
tree2cabe422ddeb41719a9799b5ef8082e237e16d78 /sys/conf
parent05341f326e97955d31e4bd671d2fabef9f105746 (diff)
downloadFreeBSD-src-9d514d84b92dc7bd134ec57eb7acb796a66a8dda.zip
FreeBSD-src-9d514d84b92dc7bd134ec57eb7acb796a66a8dda.tar.gz
This update primarily addresses the ability to have both the em
and the igb driver static in the kernel. But it also reflects some other bug fixes in my development stream at Intel. PR 122373 is also fixed in this code.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files24
1 files changed, 8 insertions, 16 deletions
diff --git a/sys/conf/files b/sys/conf/files
index acc024c..b010b35 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -625,17 +625,19 @@ dev/em/e1000_82543.c optional em \
compile-with "${NORMAL_C} -I$S/dev/em"
dev/em/e1000_82571.c optional em \
compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_api.c optional em \
+dev/em/e1000_api.c optional em igb \
compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_ich8lan.c optional em \
+dev/em/e1000_ich8lan.c optional em igb \
compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_mac.c optional em \
+dev/em/e1000_mac.c optional em igb \
compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_manage.c optional em \
+dev/em/e1000_manage.c optional em igb \
compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_nvm.c optional em \
+dev/em/e1000_nvm.c optional em igb \
compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_phy.c optional em \
+dev/em/e1000_phy.c optional em igb \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_osdep.c optional em igb \
compile-with "${NORMAL_C} -I$S/dev/em"
dev/en/if_en_pci.c optional en pci
dev/en/midway.c optional en
@@ -713,16 +715,6 @@ dev/igb/if_igb.c optional igb \
compile-with "${NORMAL_C} -I$S/dev/igb"
dev/igb/e1000_82575.c optional igb \
compile-with "${NORMAL_C} -I$S/dev/igb"
-dev/igb/e1000_api.c optional igb \
- compile-with "${NORMAL_C} -I$S/dev/igb"
-dev/igb/e1000_mac.c optional igb \
- compile-with "${NORMAL_C} -I$S/dev/igb"
-dev/igb/e1000_manage.c optional igb \
- compile-with "${NORMAL_C} -I$S/dev/igb"
-dev/igb/e1000_nvm.c optional igb \
- compile-with "${NORMAL_C} -I$S/dev/igb"
-dev/igb/e1000_phy.c optional igb \
- compile-with "${NORMAL_C} -I$S/dev/igb"
dev/iicbus/ad7418.c optional ad7418
dev/iicbus/ds1672.c optional ds1672
dev/iicbus/icee.c optional icee
OpenPOWER on IntegriCloud