Linux MIPS Architecture development
 help / color / mirror / Atom feed
From: Laurent Fasnacht <l@libres.ch>
To: linux-mips@linux-mips.org
Cc: trivial@kernel.org
Subject: [PATCH] MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set
Date: Wed, 27 May 2015 19:50:00 +0200	[thread overview]
Message-ID: <556603C8.5010502@libres.ch> (raw)

initrd_start is defined in init/do_mounts_initrd.c, which is only
included in kernel if CONFIG_BLK_DEV_INITRD=y.

Signed-off-by: Laurent Fasnacht <l@libres.ch>
---
 arch/mips/ath79/prom.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/mips/ath79/prom.c b/arch/mips/ath79/prom.c
index e1fe630..597899a 100644
--- a/arch/mips/ath79/prom.c
+++ b/arch/mips/ath79/prom.c
@@ -1,6 +1,7 @@
 /*
  *  Atheros AR71XX/AR724X/AR913X specific prom routines
  *
+ *  Copyright (C) 2015 Laurent Fasnacht <l@libres.ch>
  *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
@@ -25,12 +26,14 @@ void __init prom_init(void)
 {
 	fw_init_cmdline();
 +#ifdef CONFIG_BLK_DEV_INITRD
 	/* Read the initrd address from the firmware environment */
 	initrd_start = fw_getenvl("initrd_start");
 	if (initrd_start) {
 		initrd_start = KSEG0ADDR(initrd_start);
 		initrd_end = initrd_start + fw_getenvl("initrd_size");
 	}
+#endif
 }
  void __init prom_free_prom_memory(void)
-- 
2.0.4

             reply	other threads:[~2015-05-27 17:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-27 17:50 Laurent Fasnacht [this message]
2015-05-28 15:38 ` [PATCH] MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set Ralf Baechle
2015-05-29  8:49   ` Laurent Fasnacht

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=556603C8.5010502@libres.ch \
    --to=l@libres.ch \
    --cc=linux-mips@linux-mips.org \
    --cc=trivial@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