Has source been updated with Hibbits' recent patches?

[Super Bisquit]

Reapplied wi_2.diff to an updated wi/Makefile. Following, the second patch
was applied. Both patches were done as patch </$HOME/$DIFF#.
Somewhere, I applied the patches incorrectly. Output asked if I wanted to
reverse the previous patch  i.e wi_2 to be reversed; and, I complied.
Attached is the error.
Before reading it, was the error on my part for applying the second patch
and then allowing a reversal during the process?
Also, use MACHINE and not MACHINE_CPUARCH in the Makefile.

On Wed, Feb 1, 2012 at 11:23 AM, Justin Hibbits <chmeeedalf at gmail.com>wrote:

> 11:23 AM me: I just screwed up the wi/Makefile and updated the src again.
> I'm reapplying all the patches now. Apologies for bothering yo.
>
-------------- next part --------------
Warning: Object directory not changed from original /usr/src/sys/modules/wi
cc -O2 -pipe -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc   -I. -I@ -I@/contrib/altq -finline-limit=15000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common  -mlongcall -fno-omit-frame-pointer  -msoft-float -mno-altivec -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions  -Wmissing-include-dirs -fdiagnostics-show-option   -c /usr/src/sys/modules/wi/../../dev/wi/if_wi.c
*** Error code 1

Stop in /usr/src/sys/modules/wi.