From dfc3e05b38c5f6be412d94d20f6b863a1cb231e3 Mon Sep 17 00:00:00 2001
From: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
Date: Thu, 13 Dec 2007 21:11:36 +1100
Subject: [PATCH] --- yaml --- r: 81093 b: refs/heads/master c:
 4751505cf7299318d19a42bdabe0eb5db6d732c4 h: refs/heads/master i:   81091:
 1a78c3bbfad06b7f86bb51fa2caf5341351addbc v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/powerpc/platforms/cell/setup.c |  2 --
 trunk/include/asm-powerpc/nvram.h         | 11 +++++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 827b9f67eb94..842e3e21d72b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38958dd9113c19cd7a927009ae585bd5aba3295e
+refs/heads/master: 4751505cf7299318d19a42bdabe0eb5db6d732c4
diff --git a/trunk/arch/powerpc/platforms/cell/setup.c b/trunk/arch/powerpc/platforms/cell/setup.c
index 7f42b7d0adcb..4f6347c9fe68 100644
--- a/trunk/arch/powerpc/platforms/cell/setup.c
+++ b/trunk/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/trunk/include/asm-powerpc/nvram.h b/trunk/include/asm-powerpc/nvram.h
index 9877982508bf..4e7059cc6113 100644
--- a/trunk/include/asm-powerpc/nvram.h
+++ b/trunk/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 */