From 890fc88e238c16a6d5dfa65e2d1273d330636138 Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Mon, 5 Feb 2007 20:01:15 -0600
Subject: [PATCH] --- yaml --- r: 46877 b: refs/heads/master c:
 4297c9869b3452860f1a2c588d43f9e62c701019 h: refs/heads/master i:   46875:
 253c48a34e5aada95baf098e842d921b174edc3a v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/Kconfig                 | 1 +
 trunk/arch/powerpc/platforms/maple/setup.c | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ea7f7d877437..4d024c5daae5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 721e0c9037ef4e755f3bd87fee92beff452be420
+refs/heads/master: 4297c9869b3452860f1a2c588d43f9e62c701019
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index 901f12de113a..5f80f0b828f2 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/arch/powerpc/Kconfig
@@ -491,6 +491,7 @@ config PPC_MAPLE
 	select PPC_970_NAP
 	select PPC_NATIVE
 	select PPC_RTAS
+	select MMIO_NVRAM
 	default n
 	help
           This option enables support for the Maple 970FX Evaluation Board.
diff --git a/trunk/arch/powerpc/platforms/maple/setup.c b/trunk/arch/powerpc/platforms/maple/setup.c
index 50855d4fd5a0..82d3f9e28d7c 100644
--- a/trunk/arch/powerpc/platforms/maple/setup.c
+++ b/trunk/arch/powerpc/platforms/maple/setup.c
@@ -62,6 +62,7 @@
 #include <asm/mpic.h>
 #include <asm/rtas.h>
 #include <asm/udbg.h>
+#include <asm/nvram.h>
 
 #include "maple.h"
 
@@ -195,6 +196,8 @@ void __init maple_setup_arch(void)
 	maple_use_rtas_reboot_and_halt_if_present();
 
 	printk(KERN_DEBUG "Using native/NAP idle loop\n");
+
+	mmio_nvram_init();
 }
 
 /*