diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-10 06:29:47 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-10 06:29:47 +0200 |
| commit | f222e8b40f2177b1c4cac015b117744c1d3fa3e9 (patch) | |
| tree | 7c5fc22c08da900e21b0e7ab2376e8e8e44a63c0 /net/irda/irnet/irnet.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 (diff) | |
| download | linux-f222e8b40f2177b1c4cac015b117744c1d3fa3e9.tar.xz linux-f222e8b40f2177b1c4cac015b117744c1d3fa3e9.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/irda/irnet/irnet.h')
| -rw-r--r-- | net/irda/irnet/irnet.h | 1 |
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> |