diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/usb/serial/keyspan_pda.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
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 03ab3c0f3cce..49b8dc039d1f 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 | */ |