67e1bd423c
in here to do some conflict detection. The new code doesn't do conflict detection yet, but it will be implemented in another way. aic7770.c moved to i386/eisa