From: Felipe Balbi <felipe.lima@indt.org.br>
Date: Wed, 12 Dec 2007 12:57:38 +0000 (+0200)
Subject: USB: GADGET: Compile fix for omap_udc.c
X-Git-Tag: v2.6.24-omap1~108
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8106fd312ac6c2e7e047cf2b8d66317fb1684ced;p=linux-2.6-omap-h63xx.git

USB: GADGET: Compile fix for omap_udc.c

CONTROL_DEVCONF0 has changed to OMAP2_CONTROL_DEVCONF0. Fixes
in omap_udc.c the use of such macro.

Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 2e8775e6eb6..234a0e92485 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -55,6 +55,7 @@
 #include <asm/arch/control.h>
 
 #include "omap_udc.h"
+#include "../../../arch/arm/mach-omap2/control.h"
 
 #undef	USB_TRACE
 
@@ -2272,7 +2273,7 @@ static int proc_otg_show(struct seq_file *s)
 		 * do with the frame adjustment counter and McBSP2.
 		 */
 		ctrl_name = "control_devconf";
-		trans = ctrl_read_reg(CONTROL_DEVCONF0);
+		trans = ctrl_read_reg(OMAP2_CONTROL_DEVCONF0);
 	} else {
 		ctrl_name = "tranceiver_ctrl";
 		trans = USB_TRANSCEIVER_CTRL_REG;