Fix merge problems

[platform/kernel/u-boot.git] / drivers / usb / usbdcore.c

diff --git a/drivers/usb/usbdcore.c b/drivers/usb/usbdcore.c
index 808da9f..53ed669 100644 (file)
--- a/drivers/usb/usbdcore.c
+++ b/drivers/usb/usbdcore.c
@@ -552,7 +552,7 @@ struct urb *usbd_alloc_urb (struct usb_device_instance *device,
        struct urb *urb;
 
        if (!(urb = (struct urb *) malloc (sizeof (struct urb)))) {
-               usberr (" F A T A L:  malloc(%u) FAILED!!!!",
+               usberr (" F A T A L:  malloc(%zu) FAILED!!!!",
                        sizeof (struct urb));
                return NULL;
        }