diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /drivers/usb/gadget/pxa2xx_udc.h | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
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 a58f3e6e71f1..19a883f7d1b8 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 unsigned long *reg_udccs; | 72 | volatile u32 *reg_udccs; |
| 73 | volatile unsigned long *reg_ubcr; | 73 | volatile u32 *reg_ubcr; |
| 74 | volatile unsigned long *reg_uddr; | 74 | volatile u32 *reg_uddr; |
| 75 | #ifdef USE_DMA | 75 | #ifdef USE_DMA |
| 76 | volatile unsigned long *reg_drcmr; | 76 | volatile u32 *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) |