diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/usb/serial/safe_serial.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/usb/serial/safe_serial.c')
| -rw-r--r-- | drivers/usb/serial/safe_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c index 4b463cd140ef..43a0cadd5782 100644 --- a/drivers/usb/serial/safe_serial.c +++ b/drivers/usb/serial/safe_serial.c | |||
| @@ -64,8 +64,8 @@ | |||
| 64 | 64 | ||
| 65 | #include <linux/kernel.h> | 65 | #include <linux/kernel.h> |
| 66 | #include <linux/errno.h> | 66 | #include <linux/errno.h> |
| 67 | #include <linux/gfp.h> | ||
| 67 | #include <linux/init.h> | 68 | #include <linux/init.h> |
| 68 | #include <linux/slab.h> | ||
| 69 | #include <linux/tty.h> | 69 | #include <linux/tty.h> |
| 70 | #include <linux/tty_driver.h> | 70 | #include <linux/tty_driver.h> |
| 71 | #include <linux/tty_flip.h> | 71 | #include <linux/tty_flip.h> |