linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: linux-kernel@vger.kernel.org
Cc: linux-arch@vger.kernel.org,
	Paul Gortmaker <paul.gortmaker@windriver.com>,
	linux-fbdev@vger.kernel.org
Subject: [PATCH 32/73] logo: emit "#include <linux/init.h> in autogenerated C file
Date: Tue, 21 Jan 2014 21:22:35 +0000	[thread overview]
Message-ID: <1390339396-3479-33-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1390339396-3479-1-git-send-email-paul.gortmaker@windriver.com>

The header linux_logo.h itself does not use any __init type
directives, but the autogenerated C file itself does.  Hence
move the include directive into the autogenerated file.

Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 include/linux/linux_logo.h | 3 ---
 scripts/pnmtologo.c        | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h
index ca5bd91..aea584c 100644
--- a/include/linux/linux_logo.h
+++ b/include/linux/linux_logo.h
@@ -14,9 +14,6 @@
  *  but should contain %s to display the version
  */
 
-#include <linux/init.h>
-
-
 #define LINUX_LOGO_MONO		1	/* monochrome black/white */
 #define LINUX_LOGO_VGA16	2	/* 16 colors VGA text palette */
 #define LINUX_LOGO_CLUT224	3	/* 224 colors */
diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
index 68bb4ef..06a4b4e 100644
--- a/scripts/pnmtologo.c
+++ b/scripts/pnmtologo.c
@@ -243,6 +243,7 @@ static void write_header(void)
     fputs(" *\n", out);
     fprintf(out, " *  Linux logo %s\n", logoname);
     fputs(" */\n\n", out);
+    fputs("#include <linux/init.h>\n", out);
     fputs("#include <linux/linux_logo.h>\n\n", out);
     fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
 	    logoname);
-- 
1.8.4.1


       reply	other threads:[~2014-01-21 21:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1390339396-3479-1-git-send-email-paul.gortmaker@windriver.com>
2014-01-21 21:22 ` Paul Gortmaker [this message]
2014-01-21 21:22 ` [PATCH 41/73] video: delete non-required instances of include <linux/init.h> Paul Gortmaker

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=1390339396-3479-33-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).