mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
To: barebox@lists.infradead.org
Subject: [PATCH 2/2] sizes.h: sync with Linux 3.19-rc3
Date: Thu,  8 Jan 2015 16:02:21 +0900	[thread overview]
Message-ID: <1420700541-4150-2-git-send-email-yamada.m@jp.panasonic.com> (raw)
In-Reply-To: <1420700541-4150-1-git-send-email-yamada.m@jp.panasonic.com>

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

Signed-off-by: Masahiro Yamada <yamada.m@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


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2015-01-08  7:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-08  7:02 [PATCH 1/2] sizes.h: move include/sizes.h to include/linux/sizes.h Masahiro Yamada
2015-01-08  7:02 ` Masahiro Yamada [this message]
2015-01-08 13:40 ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1420700541-4150-2-git-send-email-yamada.m@jp.panasonic.com \
    --to=yamada.m@jp.panasonic.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox