Skip to content

Commit

Permalink
MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurent Fasnacht authored and Ralf Baechle committed May 29, 2015
1 parent 5767b52 commit 556b662
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/mips/ath79/prom.c
Original file line number Diff line number Diff line change
@@ -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>
*
Expand All @@ -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)
Expand Down

0 comments on commit 556b662

Please sign in to comment.