Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[deliverable/linux.git] / include / linux / if_link.h

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 84c3492ae5cb510604c50dc4ba09941ac95f7300..f9032c88716a6c3d937adcdff70a3679e89bb887 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -79,6 +79,7 @@ enum
        IFLA_LINKINFO,
 #define IFLA_LINKINFO IFLA_LINKINFO
        IFLA_NET_NS_PID,
+       IFLA_IFALIAS,
        __IFLA_MAX
 };