summaryrefslogtreecommitdiffstats
path: root/net/irda/irnet/irnet.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-08-13 02:44:53 +0200
committerDavid S. Miller <davem@davemloft.net>2009-08-13 02:44:53 +0200
commitaa11d958d1a6572eda08214d7c6a735804fe48a5 (patch)
treed025b05270ad1e010660d17eeadc6ac3c1abbd7d /net/irda/irnet/irnet.h
parentnet,pppoe: fixup module init/exit subsequent calls (diff)
parentRevert "libertas: Read buffer overflow" (diff)
downloadlinux-aa11d958d1a6572eda08214d7c6a735804fe48a5.tar.xz
linux-aa11d958d1a6572eda08214d7c6a735804fe48a5.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: arch/microblaze/include/asm/socket.h
Diffstat (limited to 'net/irda/irnet/irnet.h')
-rw-r--r--net/irda/irnet/irnet.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index bccf4d0059f0..b001c361ad30 100644
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -241,7 +241,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/smp_lock.h>
#include <linux/skbuff.h>
#include <linux/tty.h>
#include <linux/proc_fs.h>