diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 +0200 |
commit | cdbfc557c43ea1f1f9b7062300ecb1254969814b (patch) | |
tree | 255f1cf62cea2c3dec208799a00a116e714a6128 /net/irda/irnet/irnet.h | |
parent | 4d8cc874d7ed43eda72765e9c0e141e170fee4f3 (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'net/irda/irnet/irnet.h')
-rw-r--r-- | net/irda/irnet/irnet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index b001c361ad30..bccf4d0059f0 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h @@ -241,6 +241,7 @@ #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> |