diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /drivers/usb/gadget/pxa2xx_udc.h | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/gadget/pxa2xx_udc.h')
| -rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/pxa2xx_udc.h b/drivers/usb/gadget/pxa2xx_udc.h index d0bc396a85d5..a58f3e6e71f1 100644 --- a/drivers/usb/gadget/pxa2xx_udc.h +++ b/drivers/usb/gadget/pxa2xx_udc.h | |||
| @@ -69,11 +69,11 @@ struct pxa2xx_ep { | |||
| 69 | * UDDR = UDC Endpoint Data Register (the fifo) | 69 | * UDDR = UDC Endpoint Data Register (the fifo) |
| 70 | * DRCM = DMA Request Channel Map | 70 | * DRCM = DMA Request Channel Map |
| 71 | */ | 71 | */ |
| 72 | volatile u32 *reg_udccs; | 72 | volatile unsigned long *reg_udccs; |
| 73 | volatile u32 *reg_ubcr; | 73 | volatile unsigned long *reg_ubcr; |
| 74 | volatile u32 *reg_uddr; | 74 | volatile unsigned long *reg_uddr; |
| 75 | #ifdef USE_DMA | 75 | #ifdef USE_DMA |
| 76 | volatile u32 *reg_drcmr; | 76 | volatile unsigned long *reg_drcmr; |
| 77 | #define drcmr(n) .reg_drcmr = & DRCMR ## n , | 77 | #define drcmr(n) .reg_drcmr = & DRCMR ## n , |
| 78 | #else | 78 | #else |
| 79 | #define drcmr(n) | 79 | #define drcmr(n) |