From: Milan Svoboda <[EMAIL PROTECTED]> This patch fixes compile errors when pxa2xx_udc is to be compiled for ixp4xx platform.
This patch is against 2.6.17-rc5. Please, CC: me because I'm not subscribed on the list. Signed-off-by: Milan Svoboda <[EMAIL PROTECTED]> ---
diff -uprN -X orig/Documentation/dontdiff orig/drivers/usb/gadget/pxa2xx_udc.c new_gadget/drivers/usb/gadget/pxa2xx_udc.c --- orig/drivers/usb/gadget/pxa2xx_udc.c 2006-05-17 12:08:15.000000000 +0000 +++ new_gadget/drivers/usb/gadget/pxa2xx_udc.c 2006-05-18 15:04:53.000000000 +0000 @@ -53,7 +53,9 @@ #include <asm/mach-types.h> #include <asm/unaligned.h> #include <asm/hardware.h> +#ifdef CONFIG_ARCH_PXA #include <asm/arch/pxa-regs.h> +#endif #include <linux/usb_ch9.h> #include <linux/usb_gadget.h> @@ -2575,10 +2577,12 @@ static int __exit pxa2xx_udc_remove(stru free_irq(IRQ_USB, dev); dev->got_irq = 0; } +#ifdef CONFIG_ARCH_LUBBOCK if (machine_is_lubbock()) { free_irq(LUBBOCK_USB_DISC_IRQ, dev); free_irq(LUBBOCK_USB_IRQ, dev); } +#endif platform_set_drvdata(pdev, NULL); the_controller = NULL; return 0;