diff --git a/[refs] b/[refs]
index ce6446cc67ec..60f7bb6d4999 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44ec7abe359204cc9186e32d31ef5b34c8d17274
+refs/heads/master: 6aae6e0304d33e537298867dafb2703ec58c2e4f
diff --git a/trunk/include/linux/genalloc.h b/trunk/include/linux/genalloc.h
index 9869ef3674ac..b1c70f10c42b 100644
--- a/trunk/include/linux/genalloc.h
+++ b/trunk/include/linux/genalloc.h
@@ -9,6 +9,8 @@
  */
 
 
+#ifndef __GENALLOC_H__
+#define __GENALLOC_H__
 /*
  *  General purpose special memory pool descriptor.
  */
@@ -34,3 +36,4 @@ extern int gen_pool_add(struct gen_pool *, unsigned long, size_t, int);
 extern void gen_pool_destroy(struct gen_pool *);
 extern unsigned long gen_pool_alloc(struct gen_pool *, size_t);
 extern void gen_pool_free(struct gen_pool *, unsigned long, size_t);
+#endif /* __GENALLOC_H__ */