diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /drivers/usb/serial/keyspan_pda.c | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/serial/keyspan_pda.c')
| -rw-r--r-- | drivers/usb/serial/keyspan_pda.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index 03ab3c0f3cc..49b8dc039d1 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c | |||
| @@ -78,6 +78,7 @@ | |||
| 78 | #include <linux/workqueue.h> | 78 | #include <linux/workqueue.h> |
| 79 | #include <asm/uaccess.h> | 79 | #include <asm/uaccess.h> |
| 80 | #include <linux/usb.h> | 80 | #include <linux/usb.h> |
| 81 | #include <linux/usb/serial.h> | ||
| 81 | 82 | ||
| 82 | static int debug; | 83 | static int debug; |
| 83 | 84 | ||
| @@ -107,8 +108,6 @@ struct ezusb_hex_record { | |||
| 107 | #include "xircom_pgs_fw.h" | 108 | #include "xircom_pgs_fw.h" |
| 108 | #endif | 109 | #endif |
| 109 | 110 | ||
| 110 | #include "usb-serial.h" | ||
| 111 | |||
| 112 | /* | 111 | /* |
| 113 | * Version Information | 112 | * Version Information |
| 114 | */ | 113 | */ |