diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
| commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
| tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /drivers/usb/gadget/pxa27x_udc.c | |
| parent | 1e01cb0c6ff7e9ddb6547551794c6aa82785a7cb (diff) | |
| parent | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff) | |
| download | talos-op-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.gz talos-op-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'drivers/usb/gadget/pxa27x_udc.c')
| -rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 9c0e82ec5c43..9d447d8cfc0c 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -1575,7 +1575,6 @@ static void udc_enable(struct pxa_udc *udc) { udc_writel(udc, UDCICR0, 0); udc_writel(udc, UDCICR1, 0); - udc_writel(udc, UP2OCR, UP2OCR_HXOE); udc_clear_mask_UDCCR(udc, UDCCR_UDE); clk_enable(udc->clk); |
