From 06248ffcc64fb9e906987f5eae29c5f906c7b993 Mon Sep 17 00:00:00 2001
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Wed, 30 Jul 2008 22:01:32 +0000
Subject: [PATCH] Alter kernel build to work with new dev/e1000 structure. This
 makes both em and igb, or either alone build and work in the static kernel.

MFC after:ASAP
---
 sys/conf/files | 64 +++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 1ff1c8a1d7c5..2132366a6c22 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -608,34 +608,38 @@ dev/ed/if_ed_pccard.c		optional ed pccard
 dev/ed/if_ed_pci.c		optional ed pci
 dev/eisa/eisa_if.m		standard
 dev/eisa/eisaconf.c		optional eisa
-dev/em/if_em.c			optional em \
-	compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_80003es2lan.c	optional em \
-	compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_82540.c		optional em \
-	compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_82541.c		optional em \
-	compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_82542.c		optional em \
-	compile-with "${NORMAL_C} -I$S/dev/em"
-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 | igb \
-	compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_ich8lan.c		optional em | igb \
-	compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_mac.c		optional em | igb \
-	compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_manage.c		optional em | igb \
-	compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_nvm.c		optional em | igb \
-	compile-with "${NORMAL_C} -I$S/dev/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/e1000/if_em.c		optional em \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/if_igb.c		optional igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_80003es2lan.c	optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82540.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82541.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82542.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82543.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82571.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82575.c		optional em | igb \
+	 compile-with "${NORMAL_C} -I$S/dev/igb"
+dev/e1000/e1000_ich8lan.c	optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_api.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_mac.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_manage.c	optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_nvm.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_phy.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_osdep.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/et/if_et.c			optional et
 dev/en/if_en_pci.c		optional en pci
 dev/en/midway.c			optional en
@@ -692,10 +696,6 @@ dev/ieee488/ibfoo.c		optional pcii | tnt4882
 dev/ieee488/pcii.c		optional pcii
 dev/ieee488/tnt4882.c		optional tnt4882
 dev/ieee488/upd7210.c		optional pcii | tnt4882
-dev/igb/if_igb.c		optional igb \
-	compile-with "${NORMAL_C} -I$S/dev/igb"
-dev/igb/e1000_82575.c		optional igb | em \
-	compile-with "${NORMAL_C} -I$S/dev/igb"
 dev/iicbus/ad7418.c		optional ad7418
 dev/iicbus/ds1339.c		optional ds1339
 dev/iicbus/ds1672.c		optional ds1672