diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /drivers/usb/serial/ftdi_sio.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 41b7b8628..8940704c7 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -71,11 +71,11 @@ #include <linux/errno.h> #include <linux/poll.h> #include <linux/init.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/fcntl.h> +#include <linux/tty.h> #include <linux/tty_driver.h> #include <linux/tty_flip.h> -#include <linux/tty.h> #include <linux/module.h> #include <linux/spinlock.h> |