diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-09 21:29:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-09 21:29:47 -0700 |
| commit | f222e8b40f2177b1c4cac015b117744c1d3fa3e9 (patch) | |
| tree | 7c5fc22c08da900e21b0e7ab2376e8e8e44a63c0 /net/x25/af_x25.c | |
| parent | 819ae6a389d4acfab9a7bb874fa1977aa464d14b (diff) | |
| parent | f4b9a988685da6386d7f9a72df3098bcc3270526 (diff) | |
| download | linux-f222e8b40f2177b1c4cac015b117744c1d3fa3e9.tar.bz2 | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/x25/af_x25.c')
| -rw-r--r-- | net/x25/af_x25.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 21cdc872004e..5e6c072c64d3 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -40,6 +40,7 @@ #include <linux/errno.h> #include <linux/kernel.h> #include <linux/sched.h> +#include <linux/smp_lock.h> #include <linux/timer.h> #include <linux/string.h> #include <linux/net.h> |