Merge branch 'linus' into release

[mv-sheeva.git] / fs / ceph / msgr.h

diff --git a/fs/ceph/msgr.h b/fs/ceph/msgr.h
index 892a0298dfdfddc385873412894193237cdb32c2..680d3d648cac21bd9ed201a6c4bee1651a9df10e 100644 (file)
--- a/fs/ceph/msgr.h
+++ b/fs/ceph/msgr.h
@@ -1,5 +1,5 @@
-#ifndef __MSGR_H
-#define __MSGR_H
+#ifndef CEPH_MSGR_H
+#define CEPH_MSGR_H
 
 /*
  * Data types for message passing layer used by Ceph.