X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=drivers%2Fusb%2Fotg%2Fisp1301_omap.c;h=ceee2119bffa46bf4f25e79c9686712e75129b9d;hb=033d9959ed2dc1029217d4165f80a71702dc578e;hp=7a88667742b663dc64f627560dfc5d34af32d0a7;hpb=c87985a3ce723995fc7b25e598238d67154108a1;p=deliverable%2Flinux.git

diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c
index 7a88667742b6..ceee2119bffa 100644
--- a/drivers/usb/otg/isp1301_omap.c
+++ b/drivers/usb/otg/isp1301_omap.c
@@ -36,7 +36,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #include <mach/usb.h>
 
@@ -1230,7 +1230,7 @@ static int __exit isp1301_remove(struct i2c_client *i2c)
 	isp->timer.data = 0;
 	set_bit(WORK_STOP, &isp->todo);
 	del_timer_sync(&isp->timer);
-	flush_work_sync(&isp->work);
+	flush_work(&isp->work);
 
 	put_device(&i2c->dev);
 	the_transceiver = NULL;