X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fserial%2Fkeyspan_pda.c;h=b0441c35f98fcc8b708e5569623017b931be9b54;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=59e777f1e8fdd3502eafab416be7d84bdc15d7ee;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 59e777f1e..b0441c35f 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -66,6 +66,7 @@
  */
 
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -78,7 +79,6 @@
 #include <linux/workqueue.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
-#include <linux/usb/serial.h>
 
 static int debug;
 
@@ -108,6 +108,8 @@ struct ezusb_hex_record {
 #include "xircom_pgs_fw.h"
 #endif
 
+#include "usb-serial.h"
+
 /*
  * Version Information
  */
@@ -518,13 +520,13 @@ static int keyspan_pda_write(struct usb_serial_port *port,
 	   the TX urb is in-flight (wait until it completes)
 	   the device is full (wait until it says there is room)
 	*/
-	spin_lock_bh(&port->lock);
+	spin_lock(&port->lock);
 	if (port->write_urb_busy || priv->tx_throttled) {
-		spin_unlock_bh(&port->lock);
+		spin_unlock(&port->lock);
 		return 0;
 	}
 	port->write_urb_busy = 1;
-	spin_unlock_bh(&port->lock);
+	spin_unlock(&port->lock);
 
 	/* At this point the URB is in our control, nobody else can submit it
 	   again (the only sudden transition was the one from EINPROGRESS to