From: Tony Lindgren <tony@atomide.com>
Date: Mon, 13 Aug 2007 11:23:48 +0000 (-0700)
Subject: musb_hdrc: Search and replace bBulkCombine with bulk_combine
X-Git-Tag: v2.6.23-omap1~228^2~22
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=35289e80c6fc8627f3431f900825797edb5796d4;p=linux-2.6-omap-h63xx.git

musb_hdrc: Search and replace bBulkCombine with bulk_combine

Search and replace bBulkCombine with bulk_combine

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h
index 08c696737d5..d6304a0e633 100644
--- a/drivers/usb/musb/musbdefs.h
+++ b/drivers/usb/musb/musbdefs.h
@@ -411,11 +411,11 @@ struct musb {
 #endif
 
 #ifdef C_MP_RX
-	unsigned bBulkCombine:1;
+	unsigned bulk_combine:1;
 	/* REVISIT allegedly doesn't work reliably */
 #if 0
 #define	can_bulk_combine(musb,type) \
-		(((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bBulkCombine)
+		(((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine)
 #else
 #define	can_bulk_combine(musb,type)	0
 #endif
diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index 26f5d0f3403..f4089f0c11d 100644
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -1267,7 +1267,7 @@ static int __init musb_core_init(u16 wType, struct musb *musb)
 	if (reg & MGC_M_CONFIGDATA_MPRXE) {
 		strcat(aInfo, ", bulk combine");
 #ifdef C_MP_RX
-		musb->bBulkCombine = TRUE;
+		musb->bulk_combine = TRUE;
 #else
 		strcat(aInfo, " (X)");		/* no driver support */
 #endif