---

yaml --- r: 11580 b: refs/heads/master c: c6d2ea9 h: refs/heads/master v: v3
git-mirror · Oct 14, 2005 · 9538eef · 9538eef
1 parent 31c55b5
commit 9538eef
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e29bb1a4ef69120a614391a649510010031dd8a
+refs/heads/master: c6d2ea92d162c81d4d593b4b5e0f5ceb1b940c72
diff --git a/trunk/include/asm-ppc64/iSeries/HvCallPci.h → ...arch/powerpc/platforms/iseries/call_pci.h b/trunk/include/asm-ppc64/iSeries/HvCallPci.h → ...arch/powerpc/platforms/iseries/call_pci.h
@@ -22,8 +22,8 @@
  *   Created, Jan 9, 2001
  */
 
-#ifndef _HVCALLPCI_H
-#define _HVCALLPCI_H
+#ifndef _PLATFORMS_ISERIES_CALL_PCI_H
+#define _PLATFORMS_ISERIES_CALL_PCI_H
 
 #include <asm/iSeries/HvCallSc.h>
 #include <asm/iSeries/HvTypes.h>
@@ -287,4 +287,4 @@ static inline int HvCallPci_getBusVpd(u16 busNumParm, u64 destParm,
 		return xRc & 0xFFFF;
 }
 
-#endif /* _HVCALLPCI_H */
+#endif /* _PLATFORMS_ISERIES_CALL_PCI_H */
diff --git a/trunk/arch/powerpc/platforms/iseries/irq.c b/trunk/arch/powerpc/platforms/iseries/irq.c
@@ -38,10 +38,10 @@
 #include <asm/ppcdebug.h>
 #include <asm/iSeries/HvTypes.h>
 #include <asm/iSeries/HvLpEvent.h>
-#include <asm/iSeries/HvCallPci.h>
 #include <asm/iSeries/HvCallXm.h>
 
 #include "irq.h"
+#include "call_pci.h"
 
 /* This maps virtual irq numbers to real irqs */
 unsigned int virt_irq_to_real_map[NR_IRQS];

diff --git a/trunk/arch/powerpc/platforms/iseries/pci.c b/trunk/arch/powerpc/platforms/iseries/pci.c
@@ -36,14 +36,14 @@
 #include <asm/iommu.h>
 #include <asm/abs_addr.h>
 
-#include <asm/iSeries/HvCallPci.h>
 #include <asm/iSeries/HvCallXm.h>
 #include <asm/iSeries/mf.h>
 
 #include <asm/ppc-pci.h>
 
 #include "irq.h"
 #include "pci.h"
+#include "call_pci.h"
 
 extern unsigned long io_page_mask;
 

diff --git a/trunk/arch/powerpc/platforms/iseries/vpdinfo.c b/trunk/arch/powerpc/platforms/iseries/vpdinfo.c
@@ -32,10 +32,10 @@
 #include <asm/resource.h>
 #include <asm/abs_addr.h>
 #include <asm/pci-bridge.h>
-#include <asm/iSeries/HvCallPci.h>
 #include <asm/iSeries/HvTypes.h>
 
 #include "pci.h"
+#include "call_pci.h"
 
 /*
  * Size of Bus VPD data

diff --git a/trunk/include/asm-ppc64/pci-bridge.h b/trunk/include/asm-ppc64/pci-bridge.h
@@ -6,8 +6,6 @@
 #include <linux/pci.h>
 #include <linux/list.h>
 
-#include <asm/iSeries/HvCallPci.h>
-
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License