diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 09:04:42 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 09:04:47 -0500 |
| commit | e4e91ac410356da3a518188f371e9d3b52ee38ee (patch) | |
| tree | e1b33743a08847030285d34bcb2eb8ba90f30a0c /drivers/char/specialix.c | |
| parent | ea7872b9d6a81101f6ba0ec141544a62fea35876 (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
Merge commit 'v2.6.37-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/specialix.c')
| -rw-r--r-- | drivers/char/specialix.c | 1 |
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 @@ | |||
| 87 | #include <linux/tty_flip.h> | 87 | #include <linux/tty_flip.h> |
| 88 | #include <linux/mm.h> | 88 | #include <linux/mm.h> |
| 89 | #include <linux/serial.h> | 89 | #include <linux/serial.h> |
| 90 | #include <linux/smp_lock.h> | ||
| 91 | #include <linux/fcntl.h> | 90 | #include <linux/fcntl.h> |
| 92 | #include <linux/major.h> | 91 | #include <linux/major.h> |
| 93 | #include <linux/delay.h> | 92 | #include <linux/delay.h> |