diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /net/appletalk/ddp.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
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 9fc4da56fb1d..7b02967fbbe7 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c | |||
| @@ -57,6 +57,7 @@ | |||
| 57 | #include <linux/smp_lock.h> | 57 | #include <linux/smp_lock.h> |
| 58 | #include <linux/termios.h> /* For TIOCOUTQ/INQ */ | 58 | #include <linux/termios.h> /* For TIOCOUTQ/INQ */ |
| 59 | #include <linux/compat.h> | 59 | #include <linux/compat.h> |
| 60 | #include <linux/slab.h> | ||
| 60 | #include <net/datalink.h> | 61 | #include <net/datalink.h> |
| 61 | #include <net/psnap.h> | 62 | #include <net/psnap.h> |
| 62 | #include <net/sock.h> | 63 | #include <net/sock.h> |