aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/platforms/iseries/call_pci.h (renamed from include/asm-ppc64/iSeries/HvCallPci.h)6
-rw-r--r--arch/powerpc/platforms/iseries/irq.c2
-rw-r--r--arch/powerpc/platforms/iseries/pci.c2
-rw-r--r--arch/powerpc/platforms/iseries/vpdinfo.c2
-rw-r--r--include/asm-ppc64/pci-bridge.h2
5 files changed, 6 insertions, 8 deletions
diff --git a/include/asm-ppc64/iSeries/HvCallPci.h b/arch/powerpc/platforms/iseries/call_pci.h
index 17b4840b64b2..a86e065b9577 100644
--- a/include/asm-ppc64/iSeries/HvCallPci.h
+++ b/arch/powerpc/platforms/iseries/call_pci.h
@@ -22,8 +22,8 @@
22 * Created, Jan 9, 2001 22 * Created, Jan 9, 2001
23 */ 23 */
24 24
25#ifndef _HVCALLPCI_H 25#ifndef _PLATFORMS_ISERIES_CALL_PCI_H
26#define _HVCALLPCI_H 26#define _PLATFORMS_ISERIES_CALL_PCI_H
27 27
28#include <asm/iSeries/HvCallSc.h> 28#include <asm/iSeries/HvCallSc.h>
29#include <asm/iSeries/HvTypes.h> 29#include <asm/iSeries/HvTypes.h>
@@ -287,4 +287,4 @@ static inline int HvCallPci_getBusVpd(u16 busNumParm, u64 destParm,
287 return xRc & 0xFFFF; 287 return xRc & 0xFFFF;
288} 288}
289 289
290#endif /* _HVCALLPCI_H */ 290#endif /* _PLATFORMS_ISERIES_CALL_PCI_H */
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 31fb5fa67fa3..937ac99b9d33 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -38,10 +38,10 @@
38#include <asm/ppcdebug.h> 38#include <asm/ppcdebug.h>
39#include <asm/iSeries/HvTypes.h> 39#include <asm/iSeries/HvTypes.h>
40#include <asm/iSeries/HvLpEvent.h> 40#include <asm/iSeries/HvLpEvent.h>
41#include <asm/iSeries/HvCallPci.h>
42#include <asm/iSeries/HvCallXm.h> 41#include <asm/iSeries/HvCallXm.h>
43 42
44#include "irq.h" 43#include "irq.h"
44#include "call_pci.h"
45 45
46/* This maps virtual irq numbers to real irqs */ 46/* This maps virtual irq numbers to real irqs */
47unsigned int virt_irq_to_real_map[NR_IRQS]; 47unsigned int virt_irq_to_real_map[NR_IRQS];
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index d14e9d9d7797..959e59fd9c11 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -36,7 +36,6 @@
36#include <asm/iommu.h> 36#include <asm/iommu.h>
37#include <asm/abs_addr.h> 37#include <asm/abs_addr.h>
38 38
39#include <asm/iSeries/HvCallPci.h>
40#include <asm/iSeries/HvCallXm.h> 39#include <asm/iSeries/HvCallXm.h>
41#include <asm/iSeries/mf.h> 40#include <asm/iSeries/mf.h>
42 41
@@ -44,6 +43,7 @@
44 43
45#include "irq.h" 44#include "irq.h"
46#include "pci.h" 45#include "pci.h"
46#include "call_pci.h"
47 47
48extern unsigned long io_page_mask; 48extern unsigned long io_page_mask;
49 49
diff --git a/arch/powerpc/platforms/iseries/vpdinfo.c b/arch/powerpc/platforms/iseries/vpdinfo.c
index a03984e19c13..9c318849dee7 100644
--- a/arch/powerpc/platforms/iseries/vpdinfo.c
+++ b/arch/powerpc/platforms/iseries/vpdinfo.c
@@ -32,10 +32,10 @@
32#include <asm/resource.h> 32#include <asm/resource.h>
33#include <asm/abs_addr.h> 33#include <asm/abs_addr.h>
34#include <asm/pci-bridge.h> 34#include <asm/pci-bridge.h>
35#include <asm/iSeries/HvCallPci.h>
36#include <asm/iSeries/HvTypes.h> 35#include <asm/iSeries/HvTypes.h>
37 36
38#include "pci.h" 37#include "pci.h"
38#include "call_pci.h"
39 39
40/* 40/*
41 * Size of Bus VPD data 41 * Size of Bus VPD data
diff --git a/include/asm-ppc64/pci-bridge.h b/include/asm-ppc64/pci-bridge.h
index 0474bdbf556c..1136cb6433bf 100644
--- a/include/asm-ppc64/pci-bridge.h
+++ b/include/asm-ppc64/pci-bridge.h
@@ -6,8 +6,6 @@
6#include <linux/pci.h> 6#include <linux/pci.h>
7#include <linux/list.h> 7#include <linux/list.h>
8 8
9#include <asm/iSeries/HvCallPci.h>
10
11/* 9/*
12 * This program is free software; you can redistribute it and/or 10 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License 11 * modify it under the terms of the GNU General Public License