Index: git/drivers/usb/gadget/pxa2xx_udc.c
===================================================================
--- git.orig/drivers/usb/gadget/pxa2xx_udc.c	2005-09-14 10:08:27.000000000 +0100
+++ git/drivers/usb/gadget/pxa2xx_udc.c	2005-09-14 15:44:47.000000000 +0100
@@ -422,7 +422,7 @@
 }
 
 static int
-write_packet(volatile u32 *uddr, struct pxa2xx_request *req, unsigned max)
+write_packet(volatile unsigned long *uddr, struct pxa2xx_request *req, unsigned max)
 {
 	u8		*buf;
 	unsigned	length, count;
@@ -2602,7 +2602,7 @@
  * VBUS IRQs should probably be ignored so that the PXA device just acts
  * "dead" to USB hosts until system resume.
  */
-static int pxa2xx_udc_suspend(struct device *dev, u32 state, u32 level)
+static int pxa2xx_udc_suspend(struct device *dev, pm_message_t state, u32 level)
 {
 	struct pxa2xx_udc	*udc = dev_get_drvdata(dev);
 
Index: git/drivers/usb/gadget/pxa2xx_udc.h
===================================================================
--- git.orig/drivers/usb/gadget/pxa2xx_udc.h	2005-09-14 10:08:27.000000000 +0100
+++ git/drivers/usb/gadget/pxa2xx_udc.h	2005-09-14 15:41:51.000000000 +0100
@@ -69,11 +69,11 @@
 	 * UDDR = UDC Endpoint Data Register (the fifo)
 	 * DRCM = DMA Request Channel Map
 	 */
-	volatile u32				*reg_udccs;
-	volatile u32				*reg_ubcr;
-	volatile u32				*reg_uddr;
+	volatile unsigned long			*reg_udccs;
+	volatile unsigned long			*reg_ubcr;
+	volatile unsigned long			*reg_uddr;
 #ifdef USE_DMA
-	volatile u32				*reg_drcmr;
+	volatile unsigned long			*reg_drcmr;
 #define	drcmr(n)  .reg_drcmr = & DRCMR ## n ,
 #else
 #define	drcmr(n)