ne2k_isa: intermediate merge fixup