Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus

[~andy/linux] / include / linux / notifier.h

diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index 621dfa16acc080076b08c58126e644b2ad45e68a..c0688b0168b3469bcb1a6f16001c4f81e15f2cd5 100644 (file)
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -209,8 +209,9 @@ static inline int notifier_to_errno(int ret)
 #define NETDEV_POST_TYPE_CHANGE        0x000F
 #define NETDEV_POST_INIT       0x0010
 #define NETDEV_UNREGISTER_BATCH 0x0011
-#define NETDEV_BONDING_DESLAVE  0x0012
+#define NETDEV_RELEASE         0x0012
 #define NETDEV_NOTIFY_PEERS    0x0013
+#define NETDEV_JOIN            0x0014
 
 #define SYS_DOWN       0x0001  /* Notify of system down */
 #define SYS_RESTART    SYS_DOWN