diff options
20 files changed, 19 insertions, 19 deletions
diff --git a/arch/powerpc/platforms/iseries/call_hpt.h b/arch/powerpc/platforms/iseries/call_hpt.h index a626d8c289e..a843b0f87b7 100644 --- a/arch/powerpc/platforms/iseries/call_hpt.h +++ b/arch/powerpc/platforms/iseries/call_hpt.h @@ -24,7 +24,7 @@ */ #include <asm/iseries/hv_call_sc.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/mmu.h> #define HvCallHptGetHptAddress HvCallHpt + 0 diff --git a/arch/powerpc/platforms/iseries/call_pci.h b/arch/powerpc/platforms/iseries/call_pci.h index 53cc163d468..59d4e0ad5cf 100644 --- a/arch/powerpc/platforms/iseries/call_pci.h +++ b/arch/powerpc/platforms/iseries/call_pci.h @@ -26,7 +26,7 @@ #define _PLATFORMS_ISERIES_CALL_PCI_H #include <asm/iseries/hv_call_sc.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> /* * DSA == Direct Select Address diff --git a/arch/powerpc/platforms/iseries/call_sm.h b/arch/powerpc/platforms/iseries/call_sm.h index a9726822e95..c7e251619f4 100644 --- a/arch/powerpc/platforms/iseries/call_sm.h +++ b/arch/powerpc/platforms/iseries/call_sm.h @@ -24,7 +24,7 @@ */ #include <asm/iseries/hv_call_sc.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #define HvCallSmGet64BitsOfAccessMap HvCallSm + 11 diff --git a/arch/powerpc/platforms/iseries/hvlog.c b/arch/powerpc/platforms/iseries/hvlog.c index 48a3f790038..62ec7347968 100644 --- a/arch/powerpc/platforms/iseries/hvlog.c +++ b/arch/powerpc/platforms/iseries/hvlog.c @@ -11,7 +11,7 @@ #include <asm/abs_addr.h> #include <asm/iseries/hv_call.h> #include <asm/iseries/hv_call_sc.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> void HvCall_writeLogBuffer(const void *buffer, u64 len) diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c index 55ecc8d3e73..c1135912cc0 100644 --- a/arch/powerpc/platforms/iseries/irq.c +++ b/arch/powerpc/platforms/iseries/irq.c @@ -36,7 +36,7 @@ #include <linux/spinlock.h> #include <asm/ppcdebug.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/iseries/hv_lp_event.h> #include <asm/iseries/hv_call_xm.h> diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c index 4e2dafc83bb..d607ebaef27 100644 --- a/arch/powerpc/platforms/iseries/vio.c +++ b/arch/powerpc/platforms/iseries/vio.c @@ -18,7 +18,7 @@ #include <asm/abs_addr.h> #include <asm/page.h> #include <asm/iSeries/vio.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/iseries/hv_lp_config.h> #include <asm/iseries/hv_call_xm.h> diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c index 7b1a9daae20..17bf4e70d5c 100644 --- a/arch/powerpc/platforms/iseries/viopath.c +++ b/arch/powerpc/platforms/iseries/viopath.c @@ -41,7 +41,7 @@ #include <asm/system.h> #include <asm/uaccess.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/iSeries/ItExtVpdPanel.h> #include <asm/iseries/hv_lp_event.h> #include <asm/iseries/hv_lp_config.h> diff --git a/arch/powerpc/platforms/iseries/vpdinfo.c b/arch/powerpc/platforms/iseries/vpdinfo.c index 9c318849dee..23a6d1e5b42 100644 --- a/arch/powerpc/platforms/iseries/vpdinfo.c +++ b/arch/powerpc/platforms/iseries/vpdinfo.c @@ -32,7 +32,7 @@ #include <asm/resource.h> #include <asm/abs_addr.h> #include <asm/pci-bridge.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include "pci.h" #include "call_pci.h" diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index 3af1885a820..436f169baf0 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c @@ -45,7 +45,7 @@ #include <asm/uaccess.h> #include <asm/vio.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/iseries/hv_lp_event.h> #include <asm/iseries/hv_lp_config.h> #include <asm/iSeries/vio.h> diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index da78729413f..cb87d270b6b 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c @@ -46,7 +46,7 @@ #include <asm/vio.h> #include <asm/scatterlist.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/iseries/hv_lp_event.h> #include <asm/iSeries/vio.h> diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index 57ba1a11e40..1070140d9f5 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c @@ -76,7 +76,7 @@ #include <asm/uaccess.h> #include <asm/iseries/hv_lp_config.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/iseries/hv_lp_event.h> #include <asm/iommu.h> #include <asm/vio.h> diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c index 78397d855d3..ed89659ac3b 100644 --- a/drivers/scsi/ibmvscsi/iseries_vscsi.c +++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c @@ -30,7 +30,7 @@ #include <asm/iSeries/vio.h> #include <asm/iseries/hv_lp_event.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/iseries/hv_lp_config.h> #include <asm/vio.h> #include <linux/device.h> diff --git a/include/asm-powerpc/iseries/hv_call.h b/include/asm-powerpc/iseries/hv_call.h index 5edfe2c8ea3..af59cc1e969 100644 --- a/include/asm-powerpc/iseries/hv_call.h +++ b/include/asm-powerpc/iseries/hv_call.h @@ -24,7 +24,7 @@ #define _HVCALL_H #include <asm/iseries/hv_call_sc.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/paca.h> /* Type of yield for HvCallBaseYieldProcessor */ diff --git a/include/asm-powerpc/iseries/hv_call_event.h b/include/asm-powerpc/iseries/hv_call_event.h index 202c87c39ef..c2770b056ae 100644 --- a/include/asm-powerpc/iseries/hv_call_event.h +++ b/include/asm-powerpc/iseries/hv_call_event.h @@ -24,7 +24,7 @@ #define _HVCALLEVENT_H #include <asm/iseries/hv_call_sc.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/abs_addr.h> struct HvLpEvent; diff --git a/include/asm-powerpc/iseries/hv_call_xm.h b/include/asm-powerpc/iseries/hv_call_xm.h index 8a7b6e3c01a..fd36b11612f 100644 --- a/include/asm-powerpc/iseries/hv_call_xm.h +++ b/include/asm-powerpc/iseries/hv_call_xm.h @@ -6,7 +6,7 @@ #define _HVCALLXM_H #include <asm/iseries/hv_call_sc.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #define HvCallXmGetTceTableParms HvCallXm + 0 #define HvCallXmTestBus HvCallXm + 1 diff --git a/include/asm-powerpc/iseries/hv_lp_config.h b/include/asm-powerpc/iseries/hv_lp_config.h index 9077fc8e3f6..600795bbc89 100644 --- a/include/asm-powerpc/iseries/hv_lp_config.h +++ b/include/asm-powerpc/iseries/hv_lp_config.h @@ -25,7 +25,7 @@ */ #include <asm/iseries/hv_call_sc.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/iSeries/ItLpNaca.h> enum { diff --git a/include/asm-powerpc/iseries/hv_lp_event.h b/include/asm-powerpc/iseries/hv_lp_event.h index 75ff1b3ed2e..2a3b773854b 100644 --- a/include/asm-powerpc/iseries/hv_lp_event.h +++ b/include/asm-powerpc/iseries/hv_lp_event.h @@ -24,7 +24,7 @@ #include <asm/types.h> #include <asm/ptrace.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/iseries/hv_call_event.h> /* diff --git a/include/asm-ppc64/iSeries/HvTypes.h b/include/asm-powerpc/iseries/hv_types.h index b1ef2b4cb3e..b1ef2b4cb3e 100644 --- a/include/asm-ppc64/iSeries/HvTypes.h +++ b/include/asm-powerpc/iseries/hv_types.h diff --git a/include/asm-ppc64/iSeries/mf.h b/include/asm-ppc64/iSeries/mf.h index f84404a07f4..166cd73f5c1 100644 --- a/include/asm-ppc64/iSeries/mf.h +++ b/include/asm-ppc64/iSeries/mf.h @@ -28,7 +28,7 @@ #include <linux/types.h> -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/iSeries/iseries/hv_call_event.h> struct rtc_time; diff --git a/include/asm-ppc64/iSeries/vio.h b/include/asm-ppc64/iSeries/vio.h index 4d39ce6c687..2b57dbf5c25 100644 --- a/include/asm-ppc64/iSeries/vio.h +++ b/include/asm-ppc64/iSeries/vio.h @@ -41,7 +41,7 @@ #ifndef _ISERIES_VIO_H #define _ISERIES_VIO_H -#include <asm/iSeries/HvTypes.h> +#include <asm/iseries/hv_types.h> #include <asm/iseries/hv_lp_event.h> /* |