diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-13 15:42:03 -0600 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-13 15:42:03 -0600 |
| commit | c5df3d0f11ca3b170da878cdd4782fc603c15460 (patch) | |
| tree | 8b6e061b2541f563a4393ef37dd69d20a350681d /sys/conf | |
| parent | 3469b6e4cbedf6789ee84a4ad5ce13a9286c971e (diff) | |
| parent | a3f0577ed04b6c469cd8c282522893364bebcf3f (diff) | |
| download | FreeBSD-src-c5df3d0f11ca3b170da878cdd4782fc603c15460.zip FreeBSD-src-c5df3d0f11ca3b170da878cdd4782fc603c15460.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files index 3215795..8a71f9e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1775,6 +1775,8 @@ dev/ixgbe/ix_txrx.c optional ix inet | ixv inet | ixgbe inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_phy.c optional ix inet | ixv inet | ixgbe inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_osdep.c optional ix inet | ixv inet | ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_api.c optional ix inet | ixv inet | ixgbe inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_common.c optional ix inet | ixv inet | ixgbe inet \ diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 09695ce..7a52fe7 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.3" -BRANCH="BETA1" +BRANCH="BETA2" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |
