diff options
| author | Ishizaki Kou <kou.ishizaki@toshiba.co.jp> | 2007-12-13 21:11:36 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 16:15:27 +1100 |
| commit | 4751505cf7299318d19a42bdabe0eb5db6d732c4 (patch) | |
| tree | d6e7572a3804b07cce57aeeae1b44326cce8952e | |
| parent | 38958dd9113c19cd7a927009ae585bd5aba3295e (diff) | |
[POWERPC] Cleanup calling mmio_nvram_init
This makes mmio_nvram_init() callable unconditionally by providing
a dummy definition when CONFIG_MMIO_NVRAM is not defined.
Signed-off-by: Kou Ishizaki <Kou.Ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/nvram.h | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index 7f42b7d0adcb..4f6347c9fe68 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/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) diff --git a/include/asm-powerpc/nvram.h b/include/asm-powerpc/nvram.h index 9877982508bf..4e7059cc6113 100644 --- a/include/asm-powerpc/nvram.h +++ b/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 */ |