Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

[mv-sheeva.git] / net / tipc / log.h

diff --git a/net/tipc/log.h b/net/tipc/log.h
index f4343bb9e4295c52d795656662789f1be0897409..2248d96238e66efde598d9e304764fe8d68bc3a9 100644 (file)
--- a/net/tipc/log.h
+++ b/net/tipc/log.h
@@ -34,8 +34,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _TIPC_DBG_H
-#define _TIPC_DBG_H
+#ifndef _TIPC_LOG_H
+#define _TIPC_LOG_H
 
 /**
  * struct print_buf - TIPC print buffer structure