aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ipw.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-25 06:12:01 -0500
committerPaul Mackerras <paulus@samba.org>2005-11-25 06:12:01 -0500
commit26925c5910ab77fc95b4d8bb6d98780b50ab1e5a (patch)
tree7d7506b3aedeea4db8b8659f046850db97503a89 /drivers/usb/serial/ipw.c
parent55bb239e5464ecde046af3e45052ef06efda6444 (diff)
parentcd0cca7bf5e201dcea5632f78ad9b37cb419a5df (diff)
Merge ../linux-2.6
Diffstat (limited to 'drivers/usb/serial/ipw.c')
-rw-r--r--drivers/usb/serial/ipw.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index a02fada85362..7744b8148bc5 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -46,7 +46,6 @@
46#include <linux/module.h> 46#include <linux/module.h>
47#include <linux/spinlock.h> 47#include <linux/spinlock.h>
48#include <linux/usb.h> 48#include <linux/usb.h>
49#include <linux/usb.h>
50#include <asm/uaccess.h> 49#include <asm/uaccess.h>
51#include "usb-serial.h" 50#include "usb-serial.h"
52 51