[PATCH 2/2] sizes.h: sync with Linux 3.19-rc3

[Masahiro Yamada]

Looks like I am also highly addicted to Linux...

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
---

 include/linux/sizes.h | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/include/linux/sizes.h b/include/linux/sizes.h
index 6f91e9b..ce3e815 100644
--- a/include/linux/sizes.h
+++ b/include/linux/sizes.h
@@ -1,22 +1,13 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * include/linux/sizes.h
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
- */
-/*  Size defintions
- *  Copyright (C) ARM Limited 1998. All rights reserved.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  */
+#ifndef __LINUX_SIZES_H__
+#define __LINUX_SIZES_H__
 
-#ifndef __sizes_h
-#define __sizes_h			1
-
-/* handy sizes */
 #define SZ_1				0x00000001
 #define SZ_2				0x00000002
 #define SZ_4				0x00000004
@@ -53,4 +44,4 @@
 #define SZ_1G				0x40000000
 #define SZ_2G				0x80000000
 
-#endif	/* __sizes_h */
+#endif /* __LINUX_SIZES_H__ */
-- 
1.9.1