projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[linux-2.6]
/
drivers
/
telephony
/
ixj.c
diff --git
a/drivers/telephony/ixj.c
b/drivers/telephony/ixj.c
index
a913efc
..
40de151
100644
(file)
--- a/
drivers/telephony/ixj.c
+++ b/
drivers/telephony/ixj.c
@@
-257,6
+257,7
@@
#include <linux/fs.h> /* everything... */
#include <linux/errno.h> /* error codes */
#include <linux/slab.h>
+#include <linux/smp_lock.h>
#include <linux/mm.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>