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/cdrom/viocd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/cdrom/viocd.c')

diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 36f31d202223..da78729413f4 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -47,7 +47,7 @@
 #include <asm/vio.h>
 #include <asm/scatterlist.h>
 #include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iSeries/vio.h>
 
 #define VIOCD_DEVICE			"iseries/vcd"
-- 
cgit v1.2.2


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/cdrom/viocd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/cdrom/viocd.c')

diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index da78729413f4..cb87d270b6bb 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>
 
-- 
cgit v1.2.2


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/cdrom/viocd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/cdrom/viocd.c')

diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index cb87d270b6bb..b5191780ecca 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -48,7 +48,7 @@
 #include <asm/scatterlist.h>
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.h>
 
 #define VIOCD_DEVICE			"iseries/vcd"
 #define VIOCD_DEVICE_DEVFS		"iseries/vcd"
-- 
cgit v1.2.2