From c0a8d05c8a5db835b20a3465b1be1cfe4752a13c Mon Sep 17 00:00:00 2001
From: Kelly Daly <kelly@au.ibm.com>
Date: Wed, 2 Nov 2005 11:11:11 +1100
Subject: merge filename and modify references to iseries/hv_call_event.h

Signed-off-by: Kelly Daly <kelly@au.ibm.com>
---
 drivers/char/viotape.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/char/viotape.c')

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 51abd3defc1c..232da8c5e66a 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -56,7 +56,7 @@
 #include <asm/vio.h>
 #include <asm/iSeries/vio.h>
 #include <asm/iSeries/HvLpEvent.h>
-#include <asm/iSeries/HvCallEvent.h>
+#include <asm/iseries/hv_call_event.h>
 #include <asm/iSeries/HvLpConfig.h>
 
 #define VIOTAPE_VERSION		"1.2"
-- 
cgit v1.2.3


From 15b17189489f6d759fa2d61e7b6c87c55eeffb2c Mon Sep 17 00:00:00 2001
From: Kelly Daly <kelly@au.ibm.com>
Date: Wed, 2 Nov 2005 11:55:28 +1100
Subject: merge filename and modify reference to iseries/hv_lp_config.h

Signed-off-by: Kelly Daly <kelly@au.ibm.com>
---
 drivers/char/viotape.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/char/viotape.c')

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 232da8c5e66a..296797e5a2b5 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -57,7 +57,7 @@
 #include <asm/iSeries/vio.h>
 #include <asm/iSeries/HvLpEvent.h>
 #include <asm/iseries/hv_call_event.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 
 #define VIOTAPE_VERSION		"1.2"
 #define VIOTAPE_MAXREQ		1
-- 
cgit v1.2.3


From e45423eac2e191a6cfdacdf61cb931976d73cc0b Mon Sep 17 00:00:00 2001
From: Kelly Daly <kelly@au.ibm.com>
Date: Wed, 2 Nov 2005 12:08:31 +1100
Subject: merge filename and modify references to iseries/hv_lp_event.h

Signed-off-by: Kelly Daly <kelly@au.ibm.com>
---
 drivers/char/viotape.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/char/viotape.c')

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 296797e5a2b5..3242b241d789 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -55,7 +55,7 @@
 
 #include <asm/vio.h>
 #include <asm/iSeries/vio.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
 #include <asm/iseries/hv_lp_config.h>
 
-- 
cgit v1.2.3


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

Signed-off-by: Kelly Daly <kelly@au.ibm.com>
---
 drivers/char/viotape.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'drivers/char/viotape.c')

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 3242b241d789..867cc4e418c7 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -29,7 +29,7 @@
  *
  * All tape operations are performed by sending messages back and forth to
  * the OS/400 partition.  The format of the messages is defined in
- * iSeries/vio.h
+ * iseries/vio.h
  */
 #include <linux/config.h>
 #include <linux/version.h>
@@ -54,7 +54,7 @@
 #include <asm/ioctls.h>
 
 #include <asm/vio.h>
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
 #include <asm/iseries/hv_lp_config.h>
-- 
cgit v1.2.3