diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-10 00:29:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-10 00:29:47 -0400 |
| commit | f222e8b40f2177b1c4cac015b117744c1d3fa3e9 (patch) | |
| tree | 7c5fc22c08da900e21b0e7ab2376e8e8e44a63c0 /net/appletalk | |
| parent | 819ae6a389d4acfab9a7bb874fa1977aa464d14b (diff) | |
| parent | f4b9a988685da6386d7f9a72df3098bcc3270526 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/appletalk')
| -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 @@ | |||
| 54 | #include <linux/capability.h> | 54 | #include <linux/capability.h> |
| 55 | #include <linux/module.h> | 55 | #include <linux/module.h> |
| 56 | #include <linux/if_arp.h> | 56 | #include <linux/if_arp.h> |
| 57 | #include <linux/smp_lock.h> | ||
| 57 | #include <linux/termios.h> /* For TIOCOUTQ/INQ */ | 58 | #include <linux/termios.h> /* For TIOCOUTQ/INQ */ |
| 58 | #include <net/datalink.h> | 59 | #include <net/datalink.h> |
| 59 | #include <net/psnap.h> | 60 | #include <net/psnap.h> |