git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[sfrench/cifs-2.6.git]
/
drivers
/
isdn
/
hardware
/
eicon
/
divasi.c
diff --git
a/drivers/isdn/hardware/eicon/divasi.c
b/drivers/isdn/hardware/eicon/divasi.c
index 556b19615bc76e2e8a1a0cb7458687f7449370b0..78f141e7746601591902ad8dbf4acb7684737459 100644
(file)
--- a/
drivers/isdn/hardware/eicon/divasi.c
+++ b/
drivers/isdn/hardware/eicon/divasi.c
@@
-14,7
+14,6
@@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
-#include <linux/smp_lock.h>
#include <linux/poll.h>
#include <linux/proc_fs.h>
#include <linux/skbuff.h>