aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Svoboda <msvoboda@ra.rockwell.com>2006-05-29 06:34:00 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-21 18:04:18 -0400
commit44df45a09c7c20bbd641b1c30b6406d54ba7e2c8 (patch)
treec0693d486a8b73eb64c6f281d8fd8718084c2db8
parent7c0642c196beb41b7770571b8a61151bdd418bbe (diff)
[PATCH] usb gadget: fix compile errors
This patch fixes compile errors when pxa2xx_udc is to be compiled for ixp4xx platform. Signed-off-by: Milan Svoboda <msvoboda@ra.rockwell.com> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/gadget/pxa2xx_udc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 0a609e3dfbae..af63d8236f43 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -53,7 +53,9 @@
53#include <asm/mach-types.h> 53#include <asm/mach-types.h>
54#include <asm/unaligned.h> 54#include <asm/unaligned.h>
55#include <asm/hardware.h> 55#include <asm/hardware.h>
56#ifdef CONFIG_ARCH_PXA
56#include <asm/arch/pxa-regs.h> 57#include <asm/arch/pxa-regs.h>
58#endif
57 59
58#include <linux/usb_ch9.h> 60#include <linux/usb_ch9.h>
59#include <linux/usb_gadget.h> 61#include <linux/usb_gadget.h>
@@ -2575,10 +2577,12 @@ static int __exit pxa2xx_udc_remove(struct platform_device *pdev)
2575 free_irq(IRQ_USB, dev); 2577 free_irq(IRQ_USB, dev);
2576 dev->got_irq = 0; 2578 dev->got_irq = 0;
2577 } 2579 }
2580#ifdef CONFIG_ARCH_LUBBOCK
2578 if (machine_is_lubbock()) { 2581 if (machine_is_lubbock()) {
2579 free_irq(LUBBOCK_USB_DISC_IRQ, dev); 2582 free_irq(LUBBOCK_USB_DISC_IRQ, dev);
2580 free_irq(LUBBOCK_USB_IRQ, dev); 2583 free_irq(LUBBOCK_USB_IRQ, dev);
2581 } 2584 }
2585#endif
2582 platform_set_drvdata(pdev, NULL); 2586 platform_set_drvdata(pdev, NULL);
2583 the_controller = NULL; 2587 the_controller = NULL;
2584 return 0; 2588 return 0;