summaryrefslogtreecommitdiff
path: root/drivers/char/specialix.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-12-13 11:29:52 +0300
committerTakashi Iwai <tiwai@suse.de>2010-12-13 11:29:52 +0300
commit354d14b3f53cc749c5d26d4ba7280d1e931d6bc4 (patch)
tree59b597e44902d8db8bde7deac1e7e707327c6fe6 /drivers/char/specialix.c
parent5144c534d16529bc469396211131e8935589f833 (diff)
parent5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff)
downloadlinux-354d14b3f53cc749c5d26d4ba7280d1e931d6bc4.tar.xz
Merge branch 'topic/workq-update' into topic/misc
Diffstat (limited to 'drivers/char/specialix.c')
-rw-r--r--drivers/char/specialix.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index 9f8495b4fc8f..a7616d226a49 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -87,7 +87,6 @@
#include <linux/tty_flip.h>
#include <linux/mm.h>
#include <linux/serial.h>
-#include <linux/smp_lock.h>
#include <linux/fcntl.h>
#include <linux/major.h>
#include <linux/delay.h>