diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2006-09-18 16:30:28 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2006-09-18 16:30:28 +0000 |
| commit | 3da8df60816b8289984e0afd596f9dbfc6737325 (patch) | |
| tree | bd05ae1b5fd191f6d9ca0375e4e55350022cba2a /sys/conf | |
| parent | 5901d2d38ae8bfa447ee8e4c60c40ff7f12e9c9b (diff) | |
Notes
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files | 13 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 6 |
2 files changed, 7 insertions, 12 deletions
diff --git a/sys/conf/files b/sys/conf/files index 2fc55b91261c..40bc617ac54c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -255,8 +255,6 @@ contrib/dev/acpica/utmutex.c optional acpi contrib/dev/acpica/utobject.c optional acpi contrib/dev/acpica/utstate.c optional acpi contrib/dev/acpica/utxface.c optional acpi -contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" contrib/ipfilter/netinet/fil.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \ @@ -478,15 +476,17 @@ dev/ata/atapi-cam.c optional atapicam dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist +dev/ath/ah_osdep.c optional ath_hal \ + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath.c optional ath \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath_pci.c optional ath pci \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/awi/am79c930.c optional awi dev/awi/awi.c optional awi dev/awi/if_awi_pccard.c optional awi pccard @@ -733,6 +733,7 @@ dev/mii/mii.c optional miibus | mii dev/mii/mii_physubr.c optional miibus | mii dev/mii/miibus_if.m optional miibus | mii dev/mii/mlphy.c optional miibus | mlphy +dev/mii/mvphy.c optional miibus | mvphy dev/mii/nsgphy.c optional miibus | nsgphy dev/mii/nsphy.c optional miibus | nsphy dev/mii/pnaphy.c optional miibus | pnaphy diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 26f11eaee518..6dac79d25543 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -58,12 +58,6 @@ INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S # include path into contrib'ed source files. INCLUDES+= -I$S/contrib/altq -# ... and the same for Atheros HAL when the author builds it from -# non-distributable sources. -.if defined(ATH_BUILDING_FROM_SOURCE) -INCLUDES+= -I$S/contrib/dev/ath -.endif - .if make(depend) || make(kernel-depend) # ... and the same for ipfilter |