From ba0dd617a3e23321a14cb38ff7ad6f796ba32c34 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 Sep 2005 13:15:51 +1000
Subject: [PATCH] powerpc: Create arch/powerpc/platforms/iseries

I also move arch/ppc64/kernel/HvCall.c to
arch/powerpc/platforms/iseries/hvcall.c.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/platforms/Makefile                          | 9 +++++----
 arch/powerpc/platforms/iseries/Makefile                  | 1 +
 .../HvCall.c => powerpc/platforms/iseries/hvcall.c}      | 1 -
 arch/ppc64/Makefile                                      | 1 +
 arch/ppc64/kernel/Makefile                               | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 arch/powerpc/platforms/iseries/Makefile
 rename arch/{ppc64/kernel/HvCall.c => powerpc/platforms/iseries/hvcall.c} (98%)

diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index dbc093759a89..697addea192f 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -1,4 +1,5 @@
-obj-$(CONFIG_PPC_PMAC)	+= powermac/
-obj-$(CONFIG_4xx)	+= 4xx/
-obj-$(CONFIG_83xx)	+= 83xx/
-obj-$(CONFIG_85xx)	+= 85xx/
+obj-$(CONFIG_PPC_PMAC)		+= powermac/
+obj-$(CONFIG_4xx)		+= 4xx/
+obj-$(CONFIG_83xx)		+= 83xx/
+obj-$(CONFIG_85xx)		+= 85xx/
+obj-$(CONFIG_PPC_ISERIES)	+= iseries/
diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile
new file mode 100644
index 000000000000..af0c7d97121d
--- /dev/null
+++ b/arch/powerpc/platforms/iseries/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_PPC_ISERIES) += hvcall.o
diff --git a/arch/ppc64/kernel/HvCall.c b/arch/powerpc/platforms/iseries/hvcall.c
similarity index 98%
rename from arch/ppc64/kernel/HvCall.c
rename to arch/powerpc/platforms/iseries/hvcall.c
index b772e65b57a2..f61e2e9ac9ec 100644
--- a/arch/ppc64/kernel/HvCall.c
+++ b/arch/powerpc/platforms/iseries/hvcall.c
@@ -1,5 +1,4 @@
 /*
- * HvCall.c
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
  * 
  * This program is free software; you can redistribute it and/or modify
diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
index 40675b3f924d..d4eb55f82f03 100644
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -84,6 +84,7 @@ head-y := arch/ppc64/kernel/head.o
 libs-y				+= arch/ppc64/lib/
 core-y				+= arch/ppc64/kernel/
 core-y				+= arch/ppc64/mm/
+core-y				+= arch/powerpc/platforms/
 core-$(CONFIG_XMON)		+= arch/ppc64/xmon/
 drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/
 
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index afadb6e4a6dc..aba3895b74d4 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -22,7 +22,7 @@ pci-obj-$(CONFIG_PPC_MULTIPLATFORM)	+= pci_dn.o pci_direct_iommu.o
 
 obj-$(CONFIG_PCI)	+= pci.o pci_iommu.o iomap.o $(pci-obj-y)
 
-obj-$(CONFIG_PPC_ISERIES) += HvCall.o HvLpConfig.o LparData.o \
+obj-$(CONFIG_PPC_ISERIES) += HvLpConfig.o LparData.o \
 			     iSeries_setup.o ItLpQueue.o hvCall.o \
 			     mf.o HvLpEvent.o iSeries_proc.o iSeries_htab.o \
 			     iSeries_iommu.o