Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 108456
b: refs/heads/master
c: e12cc34
h: refs/heads/master
v: v3
  • Loading branch information
Dmitry Baryshkov authored and Greg Kroah-Hartman committed Aug 14, 2008
1 parent f320333 commit 2797b03
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e5fbab51b4219fbd1dab28666affe38a920b5f7e
refs/heads/master: e12cc34527dcd945597c860c25aba92883a4a6a4
5 changes: 3 additions & 2 deletions trunk/drivers/usb/gadget/omap_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@

#include <mach/dma.h>
#include <mach/usb.h>
#include <mach/control.h>

#include "omap_udc.h"

Expand Down Expand Up @@ -2310,10 +2311,10 @@ static int proc_otg_show(struct seq_file *s)
u32 trans;
char *ctrl_name;

tmp = OTG_REV_REG;
tmp = omap_readl(OTG_REV);
if (cpu_is_omap24xx()) {
ctrl_name = "control_devconf";
trans = CONTROL_DEVCONF_REG;
trans = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
} else {
ctrl_name = "tranceiver_ctrl";
trans = omap_readw(USB_TRANSCEIVER_CTRL);
Expand Down

0 comments on commit 2797b03

Please sign in to comment.