From 1ec65d76f3e5d4863b4bf93dfd2bff37f8bf4374 Mon Sep 17 00:00:00 2001
From: Kelly Daly <kelly@au.ibm.com>
Date: Wed, 2 Nov 2005 13:46:07 +1100
Subject: merge filename and modify references to iseries/hv_types.h

Signed-off-by: Kelly Daly <kelly@au.ibm.com>
---
 drivers/block/viodasd.c               | 2 +-
 drivers/cdrom/viocd.c                 | 2 +-
 drivers/net/iseries_veth.c            | 2 +-
 drivers/scsi/ibmvscsi/iseries_vscsi.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'drivers')

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>
-- 
cgit v1.2.3