Thanks for pointing me straight. I have recovered my device and can now compile the correct branch of firmware. I did not have the USB failure on the config, but I did have to manually edit the Makefile to use the right version of libusb. I do not know how hard it is to specify that on the configure command line.