Attached patch is the result of:

dignity:~/src/linux-2.5.44 $ for x in `rgrep -l "FILL_.*URB"  *`;
do cp -v $x $x.backup;
cat $x.backup | perl -pe 's/FILL_CONTROL_URB/usb_fill_control_urb/g;
 s/FILL_BULK_URB/usb_fill_bulk_urb/g;
 s/FILL_INT_URB/usb_fill_int_urb/g;' > $x;
done

and a manual removal of the define's in usb.h.