Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-fixes

[mv-sheeva.git] / drivers / usb / serial / funsoft.c

diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c
index e8ba2cb5995db1eefc0073607facf9ade1d15599..d30f736d2cc51a604b095e333f09d7b1201bd859 100644 (file)
--- a/drivers/usb/serial/funsoft.c
+++ b/drivers/usb/serial/funsoft.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 static int debug;