svn commit: r276308 - in head/sys: conf contrib/dev/iwn

[Adrian Chadd]

Hi!

Thanks for catching this!



-adrian


On 27 December 2014 at 09:10, Marius Strobl <marius at freebsd.org> wrote:
> Author: marius
> Date: Sat Dec 27 17:10:35 2014
> New Revision: 276308
> URL: https://svnweb.freebsd.org/changeset/base/276308
>
> Log:
>   Use the same 6000 series g2{a,b} firmware versions when embedding these
>   images into the kernel as currently included into iwn6000g2{a,b}fw.ko
>   and delete the old files, missed in r254199 and r259135 respectively.
>
>   MFC after:    3 days
>
> Deleted:
>   head/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu
>   head/sys/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu
> Modified:
>   head/sys/conf/files
>
> Modified: head/sys/conf/files
> ==============================================================================
> --- head/sys/conf/files Sat Dec 27 17:10:14 2014        (r276307)
> +++ head/sys/conf/files Sat Dec 27 17:10:35 2014        (r276308)
> @@ -1731,7 +1731,7 @@ iwn6000g2afw.fwo          optional iwn6000g2afw
>         no-implicit-rule                                                \
>         clean           "iwn6000g2afw.fwo"
>  iwn6000g2a.fw                  optional iwn6000g2afw | iwnfw           \
> -       dependency      "$S/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu" \
> +       dependency      "$S/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu" \
>         compile-with    "${NORMAL_FW}"                                  \
>         no-obj no-implicit-rule                                         \
>         clean           "iwn6000g2a.fw"
> @@ -1745,7 +1745,7 @@ iwn6000g2bfw.fwo          optional iwn6000g2bfw
>         no-implicit-rule                                                \
>         clean           "iwn6000g2bfw.fwo"
>  iwn6000g2b.fw                  optional iwn6000g2bfw | iwnfw           \
> -       dependency      "$S/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu" \
> +       dependency      "$S/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu" \
>         compile-with    "${NORMAL_FW}"                                  \
>         no-obj no-implicit-rule                                         \
>         clean           "iwn6000g2b.fw"
>