diff options
-rw-r--r-- | arch/powerpc/platforms/iseries/mf.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/vio.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/viopath.c | 2 | ||||
-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 | ||||
-rw-r--r-- | include/asm-powerpc/iseries/vio.h (renamed from include/asm-ppc64/iSeries/vio.h) | 0 |
9 files changed, 9 insertions, 9 deletions
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c index 59916393dde..49e7e4b8584 100644 --- a/arch/powerpc/platforms/iseries/mf.c +++ b/arch/powerpc/platforms/iseries/mf.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include <asm/uaccess.h> | 38 | #include <asm/uaccess.h> |
39 | #include <asm/paca.h> | 39 | #include <asm/paca.h> |
40 | #include <asm/abs_addr.h> | 40 | #include <asm/abs_addr.h> |
41 | #include <asm/iSeries/vio.h> | 41 | #include <asm/iseries/vio.h> |
42 | #include <asm/iseries/mf.h> | 42 | #include <asm/iseries/mf.h> |
43 | #include <asm/iseries/hv_lp_config.h> | 43 | #include <asm/iseries/hv_lp_config.h> |
44 | #include <asm/iseries/it_lp_queue.h> | 44 | #include <asm/iseries/it_lp_queue.h> |
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c index d607ebaef27..c27a66876c2 100644 --- a/arch/powerpc/platforms/iseries/vio.c +++ b/arch/powerpc/platforms/iseries/vio.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <asm/tce.h> | 17 | #include <asm/tce.h> |
18 | #include <asm/abs_addr.h> | 18 | #include <asm/abs_addr.h> |
19 | #include <asm/page.h> | 19 | #include <asm/page.h> |
20 | #include <asm/iSeries/vio.h> | 20 | #include <asm/iseries/vio.h> |
21 | #include <asm/iseries/hv_types.h> | 21 | #include <asm/iseries/hv_types.h> |
22 | #include <asm/iseries/hv_lp_config.h> | 22 | #include <asm/iseries/hv_lp_config.h> |
23 | #include <asm/iseries/hv_call_xm.h> | 23 | #include <asm/iseries/hv_call_xm.h> |
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c index 72dfcb6d4dd..fe97bfbf746 100644 --- a/arch/powerpc/platforms/iseries/viopath.c +++ b/arch/powerpc/platforms/iseries/viopath.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include <asm/iseries/hv_lp_event.h> | 46 | #include <asm/iseries/hv_lp_event.h> |
47 | #include <asm/iseries/hv_lp_config.h> | 47 | #include <asm/iseries/hv_lp_config.h> |
48 | #include <asm/iseries/mf.h> | 48 | #include <asm/iseries/mf.h> |
49 | #include <asm/iSeries/vio.h> | 49 | #include <asm/iseries/vio.h> |
50 | 50 | ||
51 | /* Status of the path to each other partition in the system. | 51 | /* Status of the path to each other partition in the system. |
52 | * This is overkill, since we will only ever establish connections | 52 | * This is overkill, since we will only ever establish connections |
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index 436f169baf0..2d518aa2720 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 cb87d270b6b..b5191780ecc 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 694bab3b7bf..98601c7d04a 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 3242b241d78..867cc4e418c 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 ed89659ac3b..1045872b017 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> |
diff --git a/include/asm-ppc64/iSeries/vio.h b/include/asm-powerpc/iseries/vio.h index 2b57dbf5c25..2b57dbf5c25 100644 --- a/include/asm-ppc64/iSeries/vio.h +++ b/include/asm-powerpc/iseries/vio.h | |||