diff options
-rw-r--r-- | arch/powerpc/kernel/asm-offsets.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/irq.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/lpevents.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/viopath.c | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/asm-offsets.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 | 2 | ||||
-rw-r--r-- | drivers/net/iseries_veth.c | 2 | ||||
-rw-r--r-- | drivers/scsi/ibmvscsi/iseries_vscsi.c | 2 | ||||
-rw-r--r-- | include/asm-powerpc/iseries/hv_lp_event.h (renamed from include/asm-ppc64/iSeries/HvLpEvent.h) | 0 | ||||
-rw-r--r-- | include/asm-ppc64/iSeries/vio.h | 2 |
14 files changed, 13 insertions, 13 deletions
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 330cd783206f..bc5a3689cc05 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #ifdef CONFIG_PPC64 | 40 | #ifdef CONFIG_PPC64 |
41 | #include <asm/paca.h> | 41 | #include <asm/paca.h> |
42 | #include <asm/lppaca.h> | 42 | #include <asm/lppaca.h> |
43 | #include <asm/iSeries/HvLpEvent.h> | 43 | #include <asm/iseries/hv_lp_event.h> |
44 | #include <asm/cache.h> | 44 | #include <asm/cache.h> |
45 | #include <asm/systemcfg.h> | 45 | #include <asm/systemcfg.h> |
46 | #include <asm/compat.h> | 46 | #include <asm/compat.h> |
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c index b1aacf64fb8e..55ecc8d3e73f 100644 --- a/arch/powerpc/platforms/iseries/irq.c +++ b/arch/powerpc/platforms/iseries/irq.c | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | #include <asm/ppcdebug.h> | 38 | #include <asm/ppcdebug.h> |
39 | #include <asm/iSeries/HvTypes.h> | 39 | #include <asm/iSeries/HvTypes.h> |
40 | #include <asm/iSeries/HvLpEvent.h> | 40 | #include <asm/iseries/hv_lp_event.h> |
41 | #include <asm/iseries/hv_call_xm.h> | 41 | #include <asm/iseries/hv_call_xm.h> |
42 | 42 | ||
43 | #include "irq.h" | 43 | #include "irq.h" |
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c index 96aa0dd72fb0..39ee881c36c3 100644 --- a/arch/powerpc/platforms/iseries/lpevents.c +++ b/arch/powerpc/platforms/iseries/lpevents.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <asm/system.h> | 18 | #include <asm/system.h> |
19 | #include <asm/paca.h> | 19 | #include <asm/paca.h> |
20 | #include <asm/iSeries/ItLpQueue.h> | 20 | #include <asm/iSeries/ItLpQueue.h> |
21 | #include <asm/iSeries/HvLpEvent.h> | 21 | #include <asm/iseries/hv_lp_event.h> |
22 | #include <asm/iseries/hv_call_event.h> | 22 | #include <asm/iseries/hv_call_event.h> |
23 | #include <asm/iSeries/ItLpNaca.h> | 23 | #include <asm/iSeries/ItLpNaca.h> |
24 | 24 | ||
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 638747c772f8..881d81fcf3b8 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -50,7 +50,7 @@ | |||
50 | #include <asm/iseries/hv_call_xm.h> | 50 | #include <asm/iseries/hv_call_xm.h> |
51 | #include <asm/iSeries/ItLpQueue.h> | 51 | #include <asm/iSeries/ItLpQueue.h> |
52 | #include <asm/iSeries/mf.h> | 52 | #include <asm/iSeries/mf.h> |
53 | #include <asm/iSeries/HvLpEvent.h> | 53 | #include <asm/iseries/hv_lp_event.h> |
54 | #include <asm/iSeries/LparMap.h> | 54 | #include <asm/iSeries/LparMap.h> |
55 | 55 | ||
56 | #include "setup.h" | 56 | #include "setup.h" |
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c index 8e33a90bedb9..7b1a9daae206 100644 --- a/arch/powerpc/platforms/iseries/viopath.c +++ b/arch/powerpc/platforms/iseries/viopath.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
44 | #include <asm/iSeries/HvTypes.h> | 44 | #include <asm/iSeries/HvTypes.h> |
45 | #include <asm/iSeries/ItExtVpdPanel.h> | 45 | #include <asm/iSeries/ItExtVpdPanel.h> |
46 | #include <asm/iSeries/HvLpEvent.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> |
diff --git a/arch/ppc64/kernel/asm-offsets.c b/arch/ppc64/kernel/asm-offsets.c index 5e6046cb414e..504dee836d29 100644 --- a/arch/ppc64/kernel/asm-offsets.c +++ b/arch/ppc64/kernel/asm-offsets.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | #include <asm/paca.h> | 32 | #include <asm/paca.h> |
33 | #include <asm/lppaca.h> | 33 | #include <asm/lppaca.h> |
34 | #include <asm/iSeries/HvLpEvent.h> | 34 | #include <asm/iseries/hv_lp_event.h> |
35 | #include <asm/rtas.h> | 35 | #include <asm/rtas.h> |
36 | #include <asm/cputable.h> | 36 | #include <asm/cputable.h> |
37 | #include <asm/cache.h> | 37 | #include <asm/cache.h> |
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index 5c907b747648..3af1885a8200 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c | |||
@@ -46,7 +46,7 @@ | |||
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/HvTypes.h> |
49 | #include <asm/iSeries/HvLpEvent.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 | ||
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 @@ | |||
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/HvTypes.h> |
50 | #include <asm/iSeries/HvLpEvent.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" |
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index 33d7820eaab9..694bab3b7bf7 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | #include <asm/iSeries/vio.h> | 47 | #include <asm/iSeries/vio.h> |
48 | 48 | ||
49 | #include <asm/iSeries/HvLpEvent.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> |
51 | #include <asm/iseries/hv_lp_config.h> | 51 | #include <asm/iseries/hv_lp_config.h> |
52 | #include <asm/iseries/hv_call.h> | 52 | #include <asm/iseries/hv_call.h> |
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 @@ | |||
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/HvLpEvent.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> |
61 | 61 | ||
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index aaabaf30d4b8..57ba1a11e405 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
@@ -77,7 +77,7 @@ | |||
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/HvTypes.h> |
80 | #include <asm/iSeries/HvLpEvent.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> |
83 | 83 | ||
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c index c652779c1a32..78397d855d34 100644 --- a/drivers/scsi/ibmvscsi/iseries_vscsi.c +++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c | |||
@@ -29,7 +29,7 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <asm/iSeries/vio.h> | 31 | #include <asm/iSeries/vio.h> |
32 | #include <asm/iSeries/HvLpEvent.h> | 32 | #include <asm/iseries/hv_lp_event.h> |
33 | #include <asm/iSeries/HvTypes.h> | 33 | #include <asm/iSeries/HvTypes.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> |
diff --git a/include/asm-ppc64/iSeries/HvLpEvent.h b/include/asm-powerpc/iseries/hv_lp_event.h index 75ff1b3ed2e5..75ff1b3ed2e5 100644 --- a/include/asm-ppc64/iSeries/HvLpEvent.h +++ b/include/asm-powerpc/iseries/hv_lp_event.h | |||
diff --git a/include/asm-ppc64/iSeries/vio.h b/include/asm-ppc64/iSeries/vio.h index 6c05e6257f53..4d39ce6c687a 100644 --- a/include/asm-ppc64/iSeries/vio.h +++ b/include/asm-ppc64/iSeries/vio.h | |||
@@ -42,7 +42,7 @@ | |||
42 | #define _ISERIES_VIO_H | 42 | #define _ISERIES_VIO_H |
43 | 43 | ||
44 | #include <asm/iSeries/HvTypes.h> | 44 | #include <asm/iSeries/HvTypes.h> |
45 | #include <asm/iSeries/HvLpEvent.h> | 45 | #include <asm/iseries/hv_lp_event.h> |
46 | 46 | ||
47 | /* | 47 | /* |
48 | * iSeries virtual I/O events use the subtype field in | 48 | * iSeries virtual I/O events use the subtype field in |