diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /drivers/usb/gadget/pxa2xx_udc.h | |
| parent | d6a4c847e43c851cc0ddf73087a730227223f989 (diff) | |
| parent | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (diff) | |
Merge from Linus' tree.
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) |