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/cypress_m8.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/usb/serial/cypress_m8.c')
| -rw-r--r-- | drivers/usb/serial/cypress_m8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index 4ff2dfb299bd..ee70fddcab60 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
| @@ -59,11 +59,11 @@ | |||
| 59 | #include <linux/moduleparam.h> | 59 | #include <linux/moduleparam.h> |
| 60 | #include <linux/spinlock.h> | 60 | #include <linux/spinlock.h> |
| 61 | #include <linux/usb.h> | 61 | #include <linux/usb.h> |
| 62 | #include <linux/usb/serial.h> | ||
| 62 | #include <linux/serial.h> | 63 | #include <linux/serial.h> |
| 63 | #include <linux/delay.h> | 64 | #include <linux/delay.h> |
| 64 | #include <asm/uaccess.h> | 65 | #include <asm/uaccess.h> |
| 65 | 66 | ||
| 66 | #include "usb-serial.h" | ||
| 67 | #include "cypress_m8.h" | 67 | #include "cypress_m8.h" |
| 68 | 68 | ||
| 69 | 69 | ||