diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 18:24:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 18:24:22 +0200 |
| commit | 83928e17b92b7a667bfe674f1b330619adc2ac88 (patch) | |
| tree | bdfc0fd037ad1380d75cefa0e47be24e344d977c /drivers/usb/gadget/pxa2xx_udc.c | |
| parent | Merge branch 'sx8' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/mis... (diff) | |
| parent | [ARM] 3042/1: AAED-2000 - LCD panel informations (diff) | |
| download | linux-83928e17b92b7a667bfe674f1b330619adc2ac88.tar.xz linux-83928e17b92b7a667bfe674f1b330619adc2ac88.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Minor manual fixups for gfp_t clashes.
Diffstat (limited to 'drivers/usb/gadget/pxa2xx_udc.c')
| -rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c index 6e545393cfff..3d4d89c371e7 100644 --- a/drivers/usb/gadget/pxa2xx_udc.c +++ b/drivers/usb/gadget/pxa2xx_udc.c @@ -422,7 +422,7 @@ static inline void ep0_idle (struct pxa2xx_udc *dev) } static int -write_packet(volatile unsigned long *uddr, struct pxa2xx_request *req, unsigned max) +write_packet(volatile u32 *uddr, struct pxa2xx_request *req, unsigned max) { u8 *buf; unsigned length, count; |