Commit 4751505c authored by Ishizaki Kou's avatar Ishizaki Kou Committed by Paul Mackerras

[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: default avatarKou Ishizaki <Kou.Ishizaki@toshiba.co.jp>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 38958dd9
...@@ -179,9 +179,7 @@ static void __init cell_setup_arch(void) ...@@ -179,9 +179,7 @@ static void __init cell_setup_arch(void)
conswitchp = &dummy_con; conswitchp = &dummy_con;
#endif #endif
#ifdef CONFIG_MMIO_NVRAM
mmio_nvram_init(); mmio_nvram_init();
#endif
} }
static int __init cell_probe(void) static int __init cell_probe(void)
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#ifndef _ASM_POWERPC_NVRAM_H #ifndef _ASM_POWERPC_NVRAM_H
#define _ASM_POWERPC_NVRAM_H #define _ASM_POWERPC_NVRAM_H
#include <linux/errno.h>
#define NVRW_CNT 0x20 #define NVRW_CNT 0x20
#define NVRAM_HEADER_LEN 16 /* sizeof(struct nvram_header) */ #define NVRAM_HEADER_LEN 16 /* sizeof(struct nvram_header) */
#define NVRAM_BLOCK_LEN 16 #define NVRAM_BLOCK_LEN 16
...@@ -71,7 +73,16 @@ extern int nvram_clear_error_log(void); ...@@ -71,7 +73,16 @@ extern int nvram_clear_error_log(void);
extern struct nvram_partition *nvram_find_partition(int sig, const char *name); extern struct nvram_partition *nvram_find_partition(int sig, const char *name);
extern int pSeries_nvram_init(void); extern int pSeries_nvram_init(void);
#ifdef CONFIG_MMIO_NVRAM
extern int mmio_nvram_init(void); extern int mmio_nvram_init(void);
#else
static inline int mmio_nvram_init(void)
{
return -ENODEV;
}
#endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
/* PowerMac specific nvram stuffs */ /* PowerMac specific nvram stuffs */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment