Fix up Linux 3.4.77 merge error