summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Svoboda2006-05-29 12:34:00 +0200
committerGreg Kroah-Hartman2006-06-22 00:04:18 +0200
commit44df45a09c7c20bbd641b1c30b6406d54ba7e2c8 (patch)
treec0693d486a8b73eb64c6f281d8fd8718084c2db8
parent[PATCH] usb gadget: allow drivers support speeds higher than full speed (diff)
downloadkernel-qcow2-linux-44df45a09c7c20bbd641b1c30b6406d54ba7e2c8.tar.gz
kernel-qcow2-linux-44df45a09c7c20bbd641b1c30b6406d54ba7e2c8.tar.xz
kernel-qcow2-linux-44df45a09c7c20bbd641b1c30b6406d54ba7e2c8.zip
[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 @@
#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(struct platform_device *pdev)
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;