diff options
author | Kelly Daly <kelly@au.ibm.com> | 2005-11-01 23:13:57 -0500 |
---|---|---|
committer | Kelly Daly <kelly@au.ibm.com> | 2005-11-01 23:13:57 -0500 |
commit | b420677870e53b9b76ced91da207431f687eaed1 (patch) | |
tree | 1469e4a0dfb537d0a192ffd6ffd74e8faf1e8e78 /drivers | |
parent | bbc8b628b07e191624a74ce99fe36681cd70af37 (diff) |
merge filename and modify references to iseries/vio.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/viodasd.c | 2 | ||||
-rw-r--r-- | drivers/cdrom/viocd.c | 2 | ||||
-rw-r--r-- | drivers/char/viocons.c | 2 | ||||
-rw-r--r-- | drivers/char/viotape.c | 4 | ||||
-rw-r--r-- | drivers/scsi/ibmvscsi/iseries_vscsi.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index 436f169baf02..2d518aa2720a 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c | |||
@@ -48,7 +48,7 @@ | |||
48 | #include <asm/iseries/hv_types.h> | 48 | #include <asm/iseries/hv_types.h> |
49 | #include <asm/iseries/hv_lp_event.h> | 49 | #include <asm/iseries/hv_lp_event.h> |
50 | #include <asm/iseries/hv_lp_config.h> | 50 | #include <asm/iseries/hv_lp_config.h> |
51 | #include <asm/iSeries/vio.h> | 51 | #include <asm/iseries/vio.h> |
52 | 52 | ||
53 | MODULE_DESCRIPTION("iSeries Virtual DASD"); | 53 | MODULE_DESCRIPTION("iSeries Virtual DASD"); |
54 | MODULE_AUTHOR("Dave Boutcher"); | 54 | MODULE_AUTHOR("Dave Boutcher"); |
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 @@ | |||
48 | #include <asm/scatterlist.h> | 48 | #include <asm/scatterlist.h> |
49 | #include <asm/iseries/hv_types.h> | 49 | #include <asm/iseries/hv_types.h> |
50 | #include <asm/iseries/hv_lp_event.h> | 50 | #include <asm/iseries/hv_lp_event.h> |
51 | #include <asm/iSeries/vio.h> | 51 | #include <asm/iseries/vio.h> |
52 | 52 | ||
53 | #define VIOCD_DEVICE "iseries/vcd" | 53 | #define VIOCD_DEVICE "iseries/vcd" |
54 | #define VIOCD_DEVICE_DEVFS "iseries/vcd" | 54 | #define VIOCD_DEVICE_DEVFS "iseries/vcd" |
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index 694bab3b7bf7..98601c7d04a9 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #include <linux/tty_flip.h> | 44 | #include <linux/tty_flip.h> |
45 | #include <linux/sysrq.h> | 45 | #include <linux/sysrq.h> |
46 | 46 | ||
47 | #include <asm/iSeries/vio.h> | 47 | #include <asm/iseries/vio.h> |
48 | 48 | ||
49 | #include <asm/iseries/hv_lp_event.h> | 49 | #include <asm/iseries/hv_lp_event.h> |
50 | #include <asm/iseries/hv_call_event.h> | 50 | #include <asm/iseries/hv_call_event.h> |
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 @@ | |||
29 | * | 29 | * |
30 | * All tape operations are performed by sending messages back and forth to | 30 | * All tape operations are performed by sending messages back and forth to |
31 | * the OS/400 partition. The format of the messages is defined in | 31 | * the OS/400 partition. The format of the messages is defined in |
32 | * iSeries/vio.h | 32 | * iseries/vio.h |
33 | */ | 33 | */ |
34 | #include <linux/config.h> | 34 | #include <linux/config.h> |
35 | #include <linux/version.h> | 35 | #include <linux/version.h> |
@@ -54,7 +54,7 @@ | |||
54 | #include <asm/ioctls.h> | 54 | #include <asm/ioctls.h> |
55 | 55 | ||
56 | #include <asm/vio.h> | 56 | #include <asm/vio.h> |
57 | #include <asm/iSeries/vio.h> | 57 | #include <asm/iseries/vio.h> |
58 | #include <asm/iseries/hv_lp_event.h> | 58 | #include <asm/iseries/hv_lp_event.h> |
59 | #include <asm/iseries/hv_call_event.h> | 59 | #include <asm/iseries/hv_call_event.h> |
60 | #include <asm/iseries/hv_lp_config.h> | 60 | #include <asm/iseries/hv_lp_config.h> |
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c index ed89659ac3bf..1045872b0175 100644 --- a/drivers/scsi/ibmvscsi/iseries_vscsi.c +++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * hypervisor system or a converged hypervisor system. | 28 | * hypervisor system or a converged hypervisor system. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <asm/iSeries/vio.h> | 31 | #include <asm/iseries/vio.h> |
32 | #include <asm/iseries/hv_lp_event.h> | 32 | #include <asm/iseries/hv_lp_event.h> |
33 | #include <asm/iseries/hv_types.h> | 33 | #include <asm/iseries/hv_types.h> |
34 | #include <asm/iseries/hv_lp_config.h> | 34 | #include <asm/iseries/hv_lp_config.h> |