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/misc/sisusbvga/sisusb_con.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/usb/misc/sisusbvga/sisusb_con.c')
| -rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb_con.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c index b624320df903..b271b0557a1f 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_con.c +++ b/drivers/usb/misc/sisusbvga/sisusb_con.c | |||
| @@ -58,7 +58,6 @@ | |||
| 58 | #include <linux/string.h> | 58 | #include <linux/string.h> |
| 59 | #include <linux/kd.h> | 59 | #include <linux/kd.h> |
| 60 | #include <linux/init.h> | 60 | #include <linux/init.h> |
| 61 | #include <linux/slab.h> | ||
| 62 | #include <linux/vt_kern.h> | 61 | #include <linux/vt_kern.h> |
| 63 | #include <linux/selection.h> | 62 | #include <linux/selection.h> |
| 64 | #include <linux/spinlock.h> | 63 | #include <linux/spinlock.h> |