diff options
| author | Kelly Daly <kelly@au.ibm.com> | 2005-11-01 21:46:07 -0500 |
|---|---|---|
| committer | Kelly Daly <kelly@au.ibm.com> | 2005-11-01 21:46:07 -0500 |
| commit | 1ec65d76f3e5d4863b4bf93dfd2bff37f8bf4374 (patch) | |
| tree | c3c31614e923a95413f6a89a1a451c3a1db5cf13 /drivers | |
| parent | e45423eac2e191a6cfdacdf61cb931976d73cc0b (diff) | |
merge filename and modify references to iseries/hv_types.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/net/iseries_veth.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/ibmvscsi/iseries_vscsi.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index 3af1885a8200..436f169baf02 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | 45 | ||
| 46 | #include <asm/uaccess.h> | 46 | #include <asm/uaccess.h> |
| 47 | #include <asm/vio.h> | 47 | #include <asm/vio.h> |
| 48 | #include <asm/iSeries/HvTypes.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> |
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 @@ | |||
| 46 | 46 | ||
| 47 | #include <asm/vio.h> | 47 | #include <asm/vio.h> |
| 48 | #include <asm/scatterlist.h> | 48 | #include <asm/scatterlist.h> |
| 49 | #include <asm/iSeries/HvTypes.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 | ||
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index 57ba1a11e405..1070140d9f59 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
| @@ -76,7 +76,7 @@ | |||
| 76 | #include <asm/uaccess.h> | 76 | #include <asm/uaccess.h> |
| 77 | 77 | ||
| 78 | #include <asm/iseries/hv_lp_config.h> | 78 | #include <asm/iseries/hv_lp_config.h> |
| 79 | #include <asm/iSeries/HvTypes.h> | 79 | #include <asm/iseries/hv_types.h> |
| 80 | #include <asm/iseries/hv_lp_event.h> | 80 | #include <asm/iseries/hv_lp_event.h> |
| 81 | #include <asm/iommu.h> | 81 | #include <asm/iommu.h> |
| 82 | #include <asm/vio.h> | 82 | #include <asm/vio.h> |
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c index 78397d855d34..ed89659ac3bf 100644 --- a/drivers/scsi/ibmvscsi/iseries_vscsi.c +++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c | |||
| @@ -30,7 +30,7 @@ | |||
| 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/HvTypes.h> | 33 | #include <asm/iseries/hv_types.h> |
| 34 | #include <asm/iseries/hv_lp_config.h> | 34 | #include <asm/iseries/hv_lp_config.h> |
| 35 | #include <asm/vio.h> | 35 | #include <asm/vio.h> |
| 36 | #include <linux/device.h> | 36 | #include <linux/device.h> |