diff options
Diffstat (limited to 'drivers/usb/musb/musb_core.h')
-rw-r--r-- | drivers/usb/musb/musb_core.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 03d50909b078..2ac0e6f7dd9d 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h | |||
@@ -412,21 +412,13 @@ struct musb { | |||
412 | unsigned hb_iso_rx:1; /* high bandwidth iso rx? */ | 412 | unsigned hb_iso_rx:1; /* high bandwidth iso rx? */ |
413 | unsigned hb_iso_tx:1; /* high bandwidth iso tx? */ | 413 | unsigned hb_iso_tx:1; /* high bandwidth iso tx? */ |
414 | 414 | ||
415 | #ifdef C_MP_TX | 415 | unsigned bulk_split:1; |
416 | unsigned bulk_split:1; | ||
417 | #define can_bulk_split(musb,type) \ | 416 | #define can_bulk_split(musb,type) \ |
418 | (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_split) | 417 | (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_split) |
419 | #else | ||
420 | #define can_bulk_split(musb, type) 0 | ||
421 | #endif | ||
422 | 418 | ||
423 | #ifdef C_MP_RX | 419 | unsigned bulk_combine:1; |
424 | unsigned bulk_combine:1; | ||
425 | #define can_bulk_combine(musb,type) \ | 420 | #define can_bulk_combine(musb,type) \ |
426 | (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine) | 421 | (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine) |
427 | #else | ||
428 | #define can_bulk_combine(musb, type) 0 | ||
429 | #endif | ||
430 | 422 | ||
431 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | 423 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC |
432 | /* is_suspended means USB B_PERIPHERAL suspend */ | 424 | /* is_suspended means USB B_PERIPHERAL suspend */ |