diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
| commit | d932cb7e630cae3b6b5307b767d296ff1a597c5e (patch) | |
| tree | f930d068a12a256fabef0864bcdf8e85f095369e /drivers/usb/serial/funsoft.c | |
| parent | 73b59a3b1c09e4bfc678400b77b96134dcfbf112 (diff) | |
| parent | f5d635f649607b09b0b4620d25d028fd2b1b7ea5 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/usb/serial/funsoft.c')
| -rw-r--r-- | drivers/usb/serial/funsoft.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c index 803721b97e2e..77b977206a8c 100644 --- a/drivers/usb/serial/funsoft.c +++ b/drivers/usb/serial/funsoft.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/tty.h> | 13 | #include <linux/tty.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/usb.h> | 15 | #include <linux/usb.h> |
| 16 | #include "usb-serial.h" | 16 | #include <linux/usb/serial.h> |
| 17 | 17 | ||
| 18 | static struct usb_device_id id_table [] = { | 18 | static struct usb_device_id id_table [] = { |
| 19 | { USB_DEVICE(0x1404, 0xcddc) }, | 19 | { USB_DEVICE(0x1404, 0xcddc) }, |