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/appletalk/ddp.c | |
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/appletalk/ddp.c')
-rw-r--r-- | net/appletalk/ddp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 9ef6ff26eb0c..875eda5dbad7 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -54,6 +54,7 @@ #include <linux/capability.h> #include <linux/module.h> #include <linux/if_arp.h> +#include <linux/smp_lock.h> #include <linux/termios.h> /* For TIOCOUTQ/INQ */ #include <net/datalink.h> #include <net/psnap.h> |