This patch adds conditional initialization for mmio_nvram_init(). Signed-off-by: Kou Ishizaki <[EMAIL PROTECTED]> ---
Here is the previous discussion: http://ozlabs.org/pipermail/linuxppc-dev/2007-December/047435.html Index: linux-powerpc-git/arch/powerpc/platforms/cell/setup.c =================================================================== --- linux-powerpc-git.orig/arch/powerpc/platforms/cell/setup.c +++ linux-powerpc-git/arch/powerpc/platforms/cell/setup.c @@ -179,9 +179,7 @@ static void __init cell_setup_arch(void) conswitchp = &dummy_con; #endif -#ifdef CONFIG_MMIO_NVRAM mmio_nvram_init(); -#endif } static int __init cell_probe(void) Index: linux-powerpc-git/include/asm-powerpc/nvram.h =================================================================== --- linux-powerpc-git.orig/include/asm-powerpc/nvram.h +++ linux-powerpc-git/include/asm-powerpc/nvram.h @@ -10,6 +10,8 @@ #ifndef _ASM_POWERPC_NVRAM_H #define _ASM_POWERPC_NVRAM_H +#include <linux/errno.h> + #define NVRW_CNT 0x20 #define NVRAM_HEADER_LEN 16 /* sizeof(struct nvram_header) */ #define NVRAM_BLOCK_LEN 16 @@ -71,7 +73,16 @@ extern int nvram_clear_error_log(void); extern struct nvram_partition *nvram_find_partition(int sig, const char *name); extern int pSeries_nvram_init(void); + +#ifdef CONFIG_MMIO_NVRAM extern int mmio_nvram_init(void); +#else +static inline int mmio_nvram_init(void) +{ + return -ENODEV; +} +#endif + #endif /* __KERNEL__ */ /* PowerMac specific nvram stuffs */ _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
