[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set
From:       "Linux Kernel Mailing List" <linux-kernel () vger ! kernel ! org>
Date:       2015-05-31 19:06:11
Message-ID: 20150531190611.CB8E8660ED4 () gitolite ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/linus/;a=commit;h=556b6629c10c65cee42fa893681ffdd653d097c4
Commit:     556b6629c10c65cee42fa893681ffdd653d097c4
Parent:     5767b52c47488e288c6b6f94e4739e1fdfdf4e81
Refname:    refs/heads/master
Author:     Laurent Fasnacht <l@libres.ch>
AuthorDate: Wed May 27 19:50:00 2015 +0200
Committer:  Ralf Baechle <ralf@linux-mips.org>
CommitDate: Fri May 29 20:23:36 2015 +0200

    MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set
    
    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>
    Cc: linux-mips@linux-mips.org
    Cc: trivial@kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/10198/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
 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)
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]