From 38ae471c39c0c9f6fbf0156b66eec197b4d2191c Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Dec 2007 01:55:50 +1100
Subject: [PATCH] --- yaml --- r: 81018 b: refs/heads/master c:
 2cd1008cf56371404055fbc7d59f6da060af16fa h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/powerpc/platforms/iseries/pci.c | 11 +++++++++++
 trunk/arch/powerpc/platforms/iseries/pci.h | 13 +------------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 92dd0c226bea..f2d0c173557d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72ece3b8271bb59b25e42e3f0a1d6a3dbc69e369
+refs/heads/master: 2cd1008cf56371404055fbc7d59f6da060af16fa
diff --git a/trunk/arch/powerpc/platforms/iseries/pci.c b/trunk/arch/powerpc/platforms/iseries/pci.c
index 3cf51c6df686..b46d8c5709f2 100644
--- a/trunk/arch/powerpc/platforms/iseries/pci.c
+++ b/trunk/arch/powerpc/platforms/iseries/pci.c
@@ -68,6 +68,17 @@ static u8 iobar_table[IOMM_TABLE_MAX_ENTRIES];
 static const char pci_io_text[] = "iSeries PCI I/O";
 static DEFINE_SPINLOCK(iomm_table_lock);
 
+/*
+ * Generate a Direct Select Address for the Hypervisor
+ */
+static inline u64 iseries_ds_addr(struct device_node *node)
+{
+	struct pci_dn *pdn = PCI_DN(node);
+
+	return ((u64)pdn->busno << 48) + ((u64)pdn->bussubno << 40)
+			+ ((u64)0x10 << 32);
+}
+
 /*
  * iomm_table_allocate_entry
  *
diff --git a/trunk/arch/powerpc/platforms/iseries/pci.h b/trunk/arch/powerpc/platforms/iseries/pci.h
index 3cb18fa07b63..3af9cf1c1d04 100644
--- a/trunk/arch/powerpc/platforms/iseries/pci.h
+++ b/trunk/arch/powerpc/platforms/iseries/pci.h
@@ -30,7 +30,7 @@
  * End Change Activity
  */
 
-#include <asm/pci-bridge.h>
+#include <asm/iseries/hv_types.h>
 
 struct pci_dev;				/* For Forward Reference */
 
@@ -47,17 +47,6 @@ struct pci_dev;				/* For Forward Reference */
 #define ISERIES_GET_DEVICE_FROM_SUBBUS(subbus)		((subbus >> 5) & 0x7)
 #define ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus)	((subbus >> 2) & 0x7)
 
-/*
- * Generate a Direct Select Address for the Hypervisor
- */
-static inline u64 iseries_ds_addr(struct device_node *node)
-{
-	struct pci_dn *pdn = PCI_DN(node);
-
-	return ((u64)pdn->busno << 48) + ((u64)pdn->bussubno << 40)
-			+ ((u64)0x10 << 32);
-}
-
 extern void	iSeries_Device_Information(struct pci_dev *PciDev, int count,
 			u16 bus, HvSubBusNumber subbus);
 #ifdef CONFIG_PCI