summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelly Daly <kelly@au.ibm.com>2005-11-02 03:37:22 +0300
committerKelly Daly <kelly@au.ibm.com>2005-11-02 03:37:22 +0300
commit50592f5d2ae7b95b239ea41d76ad81fee046be86 (patch)
treebe90ec454e8e95ebc3541751c1dee389bd5ca739
parentc0a8d05c8a5db835b20a3465b1be1cfe4752a13c (diff)
downloadlinux-50592f5d2ae7b95b239ea41d76ad81fee046be86.tar.xz
merge filename and modify references to iseries/hv_call_sc.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
-rw-r--r--arch/powerpc/platforms/iseries/call_hpt.h2
-rw-r--r--arch/powerpc/platforms/iseries/call_pci.h2
-rw-r--r--arch/powerpc/platforms/iseries/call_sm.h2
-rw-r--r--arch/powerpc/platforms/iseries/hvlog.c2
-rw-r--r--arch/powerpc/platforms/iseries/ksyms.c2
-rw-r--r--include/asm-powerpc/iseries/hv_call.h2
-rw-r--r--include/asm-powerpc/iseries/hv_call_event.h2
-rw-r--r--include/asm-powerpc/iseries/hv_call_sc.h (renamed from include/asm-ppc64/iSeries/HvCallSc.h)0
-rw-r--r--include/asm-ppc64/iSeries/HvCallXm.h2
-rw-r--r--include/asm-ppc64/iSeries/HvLpConfig.h2
10 files changed, 9 insertions, 9 deletions
diff --git a/arch/powerpc/platforms/iseries/call_hpt.h b/arch/powerpc/platforms/iseries/call_hpt.h
index 321f3bb7a8f5..a626d8c289ee 100644
--- a/arch/powerpc/platforms/iseries/call_hpt.h
+++ b/arch/powerpc/platforms/iseries/call_hpt.h
@@ -23,7 +23,7 @@
* drive the hypervisor from the OS.
*/
-#include <asm/iSeries/HvCallSc.h>
+#include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h>
#include <asm/mmu.h>
diff --git a/arch/powerpc/platforms/iseries/call_pci.h b/arch/powerpc/platforms/iseries/call_pci.h
index a86e065b9577..53cc163d4689 100644
--- a/arch/powerpc/platforms/iseries/call_pci.h
+++ b/arch/powerpc/platforms/iseries/call_pci.h
@@ -25,7 +25,7 @@
#ifndef _PLATFORMS_ISERIES_CALL_PCI_H
#define _PLATFORMS_ISERIES_CALL_PCI_H
-#include <asm/iSeries/HvCallSc.h>
+#include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h>
/*
diff --git a/arch/powerpc/platforms/iseries/call_sm.h b/arch/powerpc/platforms/iseries/call_sm.h
index ef223166cf22..a9726822e953 100644
--- a/arch/powerpc/platforms/iseries/call_sm.h
+++ b/arch/powerpc/platforms/iseries/call_sm.h
@@ -23,7 +23,7 @@
* drive the hypervisor from the OS.
*/
-#include <asm/iSeries/HvCallSc.h>
+#include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h>
#define HvCallSmGet64BitsOfAccessMap HvCallSm + 11
diff --git a/arch/powerpc/platforms/iseries/hvlog.c b/arch/powerpc/platforms/iseries/hvlog.c
index 5a89b481f978..48a3f7900389 100644
--- a/arch/powerpc/platforms/iseries/hvlog.c
+++ b/arch/powerpc/platforms/iseries/hvlog.c
@@ -10,7 +10,7 @@
#include <asm/page.h>
#include <asm/abs_addr.h>
#include <asm/iseries/hv_call.h>
-#include <asm/iSeries/HvCallSc.h>
+#include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h>
diff --git a/arch/powerpc/platforms/iseries/ksyms.c b/arch/powerpc/platforms/iseries/ksyms.c
index f271b3539721..a2200842f4e5 100644
--- a/arch/powerpc/platforms/iseries/ksyms.c
+++ b/arch/powerpc/platforms/iseries/ksyms.c
@@ -9,7 +9,7 @@
#include <linux/module.h>
#include <asm/hw_irq.h>
-#include <asm/iSeries/HvCallSc.h>
+#include <asm/iseries/hv_call_sc.h>
EXPORT_SYMBOL(HvCall0);
EXPORT_SYMBOL(HvCall1);
diff --git a/include/asm-powerpc/iseries/hv_call.h b/include/asm-powerpc/iseries/hv_call.h
index c3f19475c0d9..5edfe2c8ea33 100644
--- a/include/asm-powerpc/iseries/hv_call.h
+++ b/include/asm-powerpc/iseries/hv_call.h
@@ -23,7 +23,7 @@
#ifndef _HVCALL_H
#define _HVCALL_H
-#include <asm/iSeries/HvCallSc.h>
+#include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h>
#include <asm/paca.h>
diff --git a/include/asm-powerpc/iseries/hv_call_event.h b/include/asm-powerpc/iseries/hv_call_event.h
index 5d9a327d0122..202c87c39ef4 100644
--- a/include/asm-powerpc/iseries/hv_call_event.h
+++ b/include/asm-powerpc/iseries/hv_call_event.h
@@ -23,7 +23,7 @@
#ifndef _HVCALLEVENT_H
#define _HVCALLEVENT_H
-#include <asm/iSeries/HvCallSc.h>
+#include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h>
#include <asm/abs_addr.h>
diff --git a/include/asm-ppc64/iSeries/HvCallSc.h b/include/asm-powerpc/iseries/hv_call_sc.h
index a62cef3822f9..a62cef3822f9 100644
--- a/include/asm-ppc64/iSeries/HvCallSc.h
+++ b/include/asm-powerpc/iseries/hv_call_sc.h
diff --git a/include/asm-ppc64/iSeries/HvCallXm.h b/include/asm-ppc64/iSeries/HvCallXm.h
index 8b9ba608daaf..8a7b6e3c01ac 100644
--- a/include/asm-ppc64/iSeries/HvCallXm.h
+++ b/include/asm-ppc64/iSeries/HvCallXm.h
@@ -5,7 +5,7 @@
#ifndef _HVCALLXM_H
#define _HVCALLXM_H
-#include <asm/iSeries/HvCallSc.h>
+#include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h>
#define HvCallXmGetTceTableParms HvCallXm + 0
diff --git a/include/asm-ppc64/iSeries/HvLpConfig.h b/include/asm-ppc64/iSeries/HvLpConfig.h
index f1cf1e70ca3c..9077fc8e3f6c 100644
--- a/include/asm-ppc64/iSeries/HvLpConfig.h
+++ b/include/asm-ppc64/iSeries/HvLpConfig.h
@@ -24,7 +24,7 @@
* to determine which resources should be allocated to each partition.
*/
-#include <asm/iSeries/HvCallSc.h>
+#include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h>
#include <asm/iSeries/ItLpNaca.h>