(This time w/o tabs.)
 
Thanks for the input. This new layout answers most concerns.

FreeBSD src/sys/contrib     -->     NetBSD src/contrib/sys
-----------------------             ----------------------
dev/ath/COPYRIGHT                   dev/ic/hal-COPYRIGHT
dev/ath/README                      dev/ic/hal-README
dev/ath/ah.h                        dev/ic/hal_ah.h   
dev/ath/ah_desc.h                   dev/ic/hal_ah_desc.h 
dev/ath/ah_devid.h                  dev/ic/hal_ah_devid.h
dev/ath/version.h                   dev/ic/hal_version.h
dev/ath/freebsd/ah_osdep.c          dev/ic/hal_ah_osdep.c
dev/ath/freebsd/ah_osdep.h          dev/ic/hal_ah_osdep.h
dev/ath/freebsd/ah_if.m             dev/ic/hal_ah_if.m
dev/ath/freebsd/opt_ah.h            arch/i386/dev/elf.opt_ah.h
dev/ath/freebsd/i386-elf.hal.o.uu   arch/i386/dev/elf.hal.o.uu

Just to be perfectly clear, the **FreeBSD layout** is in the left
column, and the NetBSD layout is in the right column. Note that I add
src/contrib/sys/ to NetBSD instead of src/sys/contrib/.

Dave

-- 
David Young             OJC Technologies
dyoung@ojctech.com      Urbana, IL * (217) 278-3933