6 files changed, 13 insertions, 7 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 0bd315de156b..aa13a9d95ea2 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -278,6 +278,7 @@ config PPC_PSERIES
         select PPC_I8259
         select PPC_RTAS
         select RTAS_ERROR_LOGGING
+        select RTAS_FW
         default y
 
 config PPC_CHRP
@@ -323,6 +324,7 @@ config PPC_CELL
         bool "  Cell Broadband Processor Architecture"
         depends on PPC_MULTIPLATFORM && PPC64
         select PPC_RTAS
+        select RTAS_FW
 
 config PPC_OF
         bool
@@ -353,6 +355,11 @@ config RTAS_ERROR_LOGGING
         depends on PPC_RTAS
         default n
 
+config RTAS_FW
+        bool
+        depends on PPC_RTAS
+        default n
+
 config MPIC_BROKEN_U3
         bool
         depends on PPC_MAPLE
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 572d4f5eaacb..abad3059a21a 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o
 obj-$(CONFIG_POWER4)            += idle_power4.o
 obj-$(CONFIG_PPC_OF)            += of_device.o
 obj-$(CONFIG_PPC_RTAS)          += rtas.o
+obj-$(CONFIG_RTAS_FW)           += rtas_fw.o
 obj-$(CONFIG_IBMVIO)            += vio.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)
diff --git a/arch/powerpc/platforms/pseries/rtas-fw.c b/arch/powerpc/kernel/rtas_fw.c
index 15d81d758ca0..448922e8af1b 100644
--- a/arch/powerpc/platforms/pseries/rtas-fw.c
+++ b/arch/powerpc/kernel/rtas_fw.c
@@ -1,6 +1,6 @@
 /*
  *
- * Procedures for firmware flash updates on pSeries systems.
+ * Procedures for firmware flash updates.
  *
  * Peter Bergner, IBM   March 2001.
  * Copyright (C) 2001 IBM.
@@ -31,8 +31,6 @@
 #include <asm/uaccess.h>
 #include <asm/systemcfg.h>
 
-#include "rtas-fw.h"
-
 struct flash_block_list_header rtas_firmware_flash_list = {0, NULL};
 
 #define FLASH_BLOCK_LIST_VERSION (1UL)
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 5ef494e3a70f..91909a844736 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -1,5 +1,5 @@
 obj-y                   := pci.o lpar.o hvCall.o nvram.o reconfig.o \
-                           setup.o iommu.o rtas-fw.o ras.o
+                           setup.o iommu.o ras.o
 obj-$(CONFIG_SMP)       += smp.o
 obj-$(CONFIG_IBMVIO)    += vio.o
 obj-$(CONFIG_XICS)      += xics.o
diff --git a/arch/powerpc/platforms/pseries/rtas-fw.h b/arch/powerpc/platforms/pseries/rtas-fw.h
deleted file mode 100644
index e70fa69974a3..000000000000
--- a/arch/powerpc/platforms/pseries/rtas-fw.h
+++ /dev/null
@@ -1,3 +0,0 @@
-void rtas_fw_restart(char *cmd);
-void rtas_fw_power_off(void);
-void rtas_fw_halt(void);
diff --git a/include/asm-powerpc/rtas.h b/include/asm-powerpc/rtas.h
index 2c050332471d..d9fd7866927f 100644
--- a/include/asm-powerpc/rtas.h
+++ b/include/asm-powerpc/rtas.h
@@ -171,6 +171,9 @@ struct flash_block_list_header { /* just the header of flash_block_list */
         struct flash_block_list *next;
 };
 extern struct flash_block_list_header rtas_firmware_flash_list;
+void rtas_fw_restart(char *cmd);
+void rtas_fw_power_off(void);
+void rtas_fw_halt(void);
 
 extern struct rtas_t rtas;