aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/if_arp.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-31 11:07:15 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-31 11:07:15 +0100
commite37c83c06c2690157a989df40dc99a6b61c9ea15 (patch)
tree024dfb8b2c9abeec9ca7cb0c0136c276d9aacc91 /include/linux/if_arp.h
parentce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a (diff)
parent67a3e12b05e055c0415c556a315a3d3eb637e29e (diff)
downloadkernel_samsung_aries-e37c83c06c2690157a989df40dc99a6b61c9ea15.zip
kernel_samsung_aries-e37c83c06c2690157a989df40dc99a6b61c9ea15.tar.gz
kernel_samsung_aries-e37c83c06c2690157a989df40dc99a6b61c9ea15.tar.bz2
Merge commit 'v2.6.35-rc1' into for-2.6.36
Diffstat (limited to 'include/linux/if_arp.h')
-rw-r--r--include/linux/if_arp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index e80b7f8..6d722f4 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -90,6 +90,7 @@
#define ARPHRD_PHONET 820 /* PhoNet media type */
#define ARPHRD_PHONET_PIPE 821 /* PhoNet pipe header */
+#define ARPHRD_CAIF 822 /* CAIF media type */
#define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */
#define ARPHRD_NONE 0xFFFE /* zero header length */