diff --git a/[refs] b/[refs]
index 736b261f60e0..c104893fb69a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bd0e1cb10b6d14dda4a8806d0a2f4f0bbf01931
+refs/heads/master: 27737aa3a9f65012b3656b71e0ff230a4811da4d
diff --git a/trunk/include/net/dcbevent.h b/trunk/include/net/dcbevent.h
index bc1e7ef40171..443626ed4cbc 100644
--- a/trunk/include/net/dcbevent.h
+++ b/trunk/include/net/dcbevent.h
@@ -24,8 +24,26 @@ enum dcbevent_notif_type {
 	DCB_APP_EVENT = 1,
 };
 
+#ifdef CONFIG_DCB
 extern int register_dcbevent_notifier(struct notifier_block *nb);
 extern int unregister_dcbevent_notifier(struct notifier_block *nb);
 extern int call_dcbevent_notifiers(unsigned long val, void *v);
+#else
+static inline int
+register_dcbevent_notifier(struct notifier_block *nb)
+{
+	return 0;
+}
+
+static inline int unregister_dcbevent_notifier(struct notifier_block *nb)
+{
+	return 0;
+}
+
+static inline int call_dcbevent_notifiers(unsigned long val, void *v)
+{
+	return 0;
+}
+#endif /* CONFIG_DCB */
 
 #endif