From 9ba8ef8c6f11fd4e73effdcd5cbde78fbd88ff1d Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2005 02:32:16 +1000
Subject: [PATCH] --- yaml --- r: 11491 b: refs/heads/master c:
 cc14d430837e8854bd160275ad71d887a8a98488 h: refs/heads/master i:   11489:
 71e9876959083e02f178624e0f4bc9f8e06bd33f   11487:
 f4674e91f9069c0a8263efa05b0929fe09250502 v: v3

---
 [refs]                                                          | 2 +-
 trunk/arch/powerpc/platforms/iseries/Makefile                   | 2 +-
 .../iSeries_iommu.c => powerpc/platforms/iseries/iommu.c}       | 2 --
 trunk/arch/ppc64/kernel/Makefile                                | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)
 rename trunk/arch/{ppc64/kernel/iSeries_iommu.c => powerpc/platforms/iseries/iommu.c} (99%)

diff --git a/[refs] b/[refs]
index 8dd06cdece84..0a39fea7491d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e508f438e0c152dcd1fbec5104e9c0ee28f352d4
+refs/heads/master: cc14d430837e8854bd160275ad71d887a8a98488
diff --git a/trunk/arch/powerpc/platforms/iseries/Makefile b/trunk/arch/powerpc/platforms/iseries/Makefile
index 4ef588c1b606..bf3992bf7ff8 100644
--- a/trunk/arch/powerpc/platforms/iseries/Makefile
+++ b/trunk/arch/powerpc/platforms/iseries/Makefile
@@ -1,2 +1,2 @@
 obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \
-	hvcall.o proc.o htab.o
+	hvcall.o proc.o htab.o iommu.o
diff --git a/trunk/arch/ppc64/kernel/iSeries_iommu.c b/trunk/arch/powerpc/platforms/iseries/iommu.c
similarity index 99%
rename from trunk/arch/ppc64/kernel/iSeries_iommu.c
rename to trunk/arch/powerpc/platforms/iseries/iommu.c
index 287db32d9867..65c76dd1d3de 100644
--- a/trunk/arch/ppc64/kernel/iSeries_iommu.c
+++ b/trunk/arch/powerpc/platforms/iseries/iommu.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc64/kernel/iSeries_iommu.c
- *
  * Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation
  *
  * Rewrite, cleanup:
diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile
index 9225a6704e8a..5988d555d36d 100644
--- a/trunk/arch/ppc64/kernel/Makefile
+++ b/trunk/arch/ppc64/kernel/Makefile
@@ -22,8 +22,6 @@ 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) += iSeries_iommu.o
-
 obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o
 
 obj-$(CONFIG_PPC_PSERIES) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o \