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>

diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index dbc093759a893f83a488437cd4e3de7934f5b5be..697addea192f01b257f344a2fa2dcb249f7f948d 100644 (file)
--- 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 (file)
index 0000000..af0c7d9
--- /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 b772e65b57a27373b92db7959486be9142125b64..f61e2e9ac9ec4d08a61db69a8de93f724b2b869b 100644 (file)
--- 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 40675b3f924d43f378a54577faa22059b74275ac..d4eb55f82f0352c37f821264d5fcb8905371186a 100644 (file)
--- 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 afadb6e4a6dc9df43293de31a7b9ff6f33452b75..aba3895b74d460267426ef99a991fa955fb03d4e 100644 (file)
--- 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