diff options
author | Kelly Daly <kelly@au.ibm.com> | 2005-11-02 11:41:12 +1100 |
---|---|---|
committer | Kelly Daly <kelly@au.ibm.com> | 2005-11-02 11:41:12 +1100 |
commit | 8021b8a77690d13ffb93eeadb6728e924d700bd5 (patch) | |
tree | 63934777a2b2e6090c23c8359f69ecba0f6d0752 | |
parent | 50592f5d2ae7b95b239ea41d76ad81fee046be86 (diff) | |
download | linux-3.10-8021b8a77690d13ffb93eeadb6728e924d700bd5.tar.gz linux-3.10-8021b8a77690d13ffb93eeadb6728e924d700bd5.tar.bz2 linux-3.10-8021b8a77690d13ffb93eeadb6728e924d700bd5.zip |
merge filename and modify references to iseries/hv_call_xm.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
-rw-r--r-- | arch/powerpc/kernel/time.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/iommu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/irq.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/pci.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/proc.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/vio.c | 2 | ||||
-rw-r--r-- | include/asm-powerpc/iseries/hv_call_xm.h (renamed from include/asm-ppc64/iSeries/HvCallXm.h) | 0 |
8 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 23436b6c188..348746c55eb 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -67,7 +67,7 @@ #endif #ifdef CONFIG_PPC_ISERIES #include <asm/iSeries/ItLpQueue.h> -#include <asm/iSeries/HvCallXm.h> +#include <asm/iseries/hv_call_xm.h> #endif /* keep track of when we need to update the rtc */ diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c index 1db26d8be64..1a6845b5c5a 100644 --- a/arch/powerpc/platforms/iseries/iommu.c +++ b/arch/powerpc/platforms/iseries/iommu.c @@ -32,7 +32,7 @@ #include <asm/machdep.h> #include <asm/abs_addr.h> #include <asm/pci-bridge.h> -#include <asm/iSeries/HvCallXm.h> +#include <asm/iseries/hv_call_xm.h> extern struct list_head iSeries_Global_Device_List; diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c index 937ac99b9d3..b1aacf64fb8 100644 --- a/arch/powerpc/platforms/iseries/irq.c +++ b/arch/powerpc/platforms/iseries/irq.c @@ -38,7 +38,7 @@ #include <asm/ppcdebug.h> #include <asm/iSeries/HvTypes.h> #include <asm/iSeries/HvLpEvent.h> -#include <asm/iSeries/HvCallXm.h> +#include <asm/iseries/hv_call_xm.h> #include "irq.h" #include "call_pci.h" diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c index 959e59fd9c1..a39b7a72010 100644 --- a/arch/powerpc/platforms/iseries/pci.c +++ b/arch/powerpc/platforms/iseries/pci.c @@ -36,7 +36,7 @@ #include <asm/iommu.h> #include <asm/abs_addr.h> -#include <asm/iSeries/HvCallXm.h> +#include <asm/iseries/hv_call_xm.h> #include <asm/iSeries/mf.h> #include <asm/ppc-pci.h> diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c index 6f1929cac66..beba0f62e65 100644 --- a/arch/powerpc/platforms/iseries/proc.c +++ b/arch/powerpc/platforms/iseries/proc.c @@ -25,7 +25,7 @@ #include <asm/time.h> #include <asm/lppaca.h> #include <asm/iSeries/ItLpQueue.h> -#include <asm/iSeries/HvCallXm.h> +#include <asm/iseries/hv_call_xm.h> #include "processor_vpd.h" #include "main_store.h" diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 2c667b180b1..669e63174ec 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c @@ -47,7 +47,7 @@ #include <asm/abs_addr.h> #include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_call_event.h> -#include <asm/iSeries/HvCallXm.h> +#include <asm/iseries/hv_call_xm.h> #include <asm/iSeries/ItLpQueue.h> #include <asm/iSeries/mf.h> #include <asm/iSeries/HvLpEvent.h> diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c index c0f7d2e9153..c64741e50cb 100644 --- a/arch/powerpc/platforms/iseries/vio.c +++ b/arch/powerpc/platforms/iseries/vio.c @@ -20,7 +20,7 @@ #include <asm/iSeries/vio.h> #include <asm/iSeries/HvTypes.h> #include <asm/iSeries/HvLpConfig.h> -#include <asm/iSeries/HvCallXm.h> +#include <asm/iseries/hv_call_xm.h> struct device *iSeries_vio_dev = &vio_bus_device.dev; EXPORT_SYMBOL(iSeries_vio_dev); diff --git a/include/asm-ppc64/iSeries/HvCallXm.h b/include/asm-powerpc/iseries/hv_call_xm.h index 8a7b6e3c01a..8a7b6e3c01a 100644 --- a/include/asm-ppc64/iSeries/HvCallXm.h +++ b/include/asm-powerpc/iseries/hv_call_xm.h |