From: Felipe Balbi <felipe.lima@xxxxxxxxxxx> 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@xxxxxxxxxxx> --- drivers/usb/gadget/omap_udc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 2e8775e..234a0e9 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; -- 1.5.3.7.1157.gbf82a - To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html