---

yaml --- r: 12283 b: refs/heads/master c: edf03c1 h: refs/heads/master i: 12281: c04405e 12279: eae60fe v: v3
git-mirror · Nov 1, 2005 · 9218f2a · 9218f2a
1 parent 0de0e04
commit 9218f2a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9add2eeb182e2bf1863c548f7a8173c45b4b92f
+refs/heads/master: edf03c1ee84e5095e8f4a4b8ad6e0784118cb176
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
@@ -325,6 +325,7 @@ config PPC_CELL
 	depends on PPC_MULTIPLATFORM && PPC64
 	select PPC_RTAS
 	select RTAS_FW
+	select MMIO_NVRAM
 
 config PPC_OF
 	bool
@@ -360,6 +361,10 @@ config RTAS_FW
 	depends on PPC_RTAS
 	default n
 
+config MMIO_NVRAM
+	bool
+	default n
+
 config MPIC_BROKEN_U3
 	bool
 	depends on PPC_MAPLE

diff --git a/trunk/arch/powerpc/sysdev/Makefile b/trunk/arch/powerpc/sysdev/Makefile
@@ -5,3 +5,4 @@ obj-$(CONFIG_PPC_MPC106)	+= grackle.o
 obj-$(CONFIG_BOOKE)		+= dcr.o
 obj-$(CONFIG_40x)		+= dcr.o
 obj-$(CONFIG_U3_DART)		+= u3_iommu.o
+obj-$(CONFIG_MMIO_NVRAM)	+= mmio_nvram.o
diff --git a/trunk/arch/ppc64/kernel/bpa_nvram.c → trunk/arch/powerpc/sysdev/mmio_nvram.c b/trunk/arch/ppc64/kernel/bpa_nvram.c → trunk/arch/powerpc/sysdev/mmio_nvram.c
diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile
@@ -31,7 +31,7 @@ endif
 
 obj-$(CONFIG_PPC_PSERIES) += rtasd.o udbg_16550.o
 
-obj-$(CONFIG_PPC_CELL) += bpa_setup.o bpa_iommu.o bpa_nvram.o \
+obj-$(CONFIG_PPC_CELL) += bpa_setup.o bpa_iommu.o \
 			 bpa_iic.o spider-pic.o
 
 obj-$(CONFIG_KEXEC)		+= machine_kexec.o