diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-04-29 19:53:17 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-04-29 19:53:17 -0400 |
| commit | d9c5841e22231e4e49fd0a1004164e6fce59b7a6 (patch) | |
| tree | e1f589c46b3ff79bbe7b1b2469f6362f94576da6 /net/802/garp.c | |
| parent | b701a47ba48b698976fb2fe05fb285b0edc1d26a (diff) | |
| parent | 5967ed87ade85a421ef814296c3c7f182b08c225 (diff) | |
Merge branch 'x86/asm' into x86/atomic
Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers
Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/alternative.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'net/802/garp.c')
| -rw-r--r-- | net/802/garp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/802/garp.c b/net/802/garp.c index 1dcb0660c49d..9ed7c0e7dc17 100644 --- a/net/802/garp.c +++ b/net/802/garp.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/etherdevice.h> | 14 | #include <linux/etherdevice.h> |
| 15 | #include <linux/rtnetlink.h> | 15 | #include <linux/rtnetlink.h> |
| 16 | #include <linux/llc.h> | 16 | #include <linux/llc.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <net/llc.h> | 18 | #include <net/llc.h> |
| 18 | #include <net/llc_pdu.h> | 19 | #include <net/llc_pdu.h> |
| 19 | #include <net/garp.h> | 20 | #include <net/garp.h> |