diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 00:06:03 -0500 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 00:06:03 -0500 |
commit | aaf8a7a2949481482200686c7bd3852e5be2e093 (patch) | |
tree | 76d4dde7c42cd3a3a9dea94f7f18a0817bb9b644 /arch/powerpc | |
parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
parent | ecb3ca2783d6e54d30dbf70a42fe995c27eeb212 (diff) |
Merge iSeries include file move
Diffstat (limited to 'arch/powerpc')
24 files changed, 58 insertions, 58 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/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 147215a0d6c0..ba30e3177b05 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <asm/cputable.h> | 35 | #include <asm/cputable.h> |
36 | #include <asm/setup.h> | 36 | #include <asm/setup.h> |
37 | #include <asm/hvcall.h> | 37 | #include <asm/hvcall.h> |
38 | #include <asm/iSeries/LparMap.h> | 38 | #include <asm/iseries/lpar_map.h> |
39 | #include <asm/thread_info.h> | 39 | #include <asm/thread_info.h> |
40 | 40 | ||
41 | #ifdef CONFIG_PPC_ISERIES | 41 | #ifdef CONFIG_PPC_ISERIES |
diff --git a/arch/powerpc/kernel/lparmap.c b/arch/powerpc/kernel/lparmap.c index b81de286df5e..eded971d1bf9 100644 --- a/arch/powerpc/kernel/lparmap.c +++ b/arch/powerpc/kernel/lparmap.c | |||
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | #include <asm/mmu.h> | 9 | #include <asm/mmu.h> |
10 | #include <asm/page.h> | 10 | #include <asm/page.h> |
11 | #include <asm/iSeries/LparMap.h> | 11 | #include <asm/iseries/lpar_map.h> |
12 | 12 | ||
13 | const struct LparMap __attribute__((__section__(".text"))) xLparMap = { | 13 | const struct LparMap __attribute__((__section__(".text"))) xLparMap = { |
14 | .xNumberEsids = HvEsidsToMap, | 14 | .xNumberEsids = HvEsidsToMap, |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 70ead7d0d12e..d4a3c5dd1a21 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
@@ -56,7 +56,7 @@ | |||
56 | #include <asm/page.h> | 56 | #include <asm/page.h> |
57 | #include <asm/mmu.h> | 57 | #include <asm/mmu.h> |
58 | #include <asm/lmb.h> | 58 | #include <asm/lmb.h> |
59 | #include <asm/iSeries/ItLpNaca.h> | 59 | #include <asm/iseries/it_lp_naca.h> |
60 | #include <asm/firmware.h> | 60 | #include <asm/firmware.h> |
61 | #include <asm/systemcfg.h> | 61 | #include <asm/systemcfg.h> |
62 | #include <asm/xmon.h> | 62 | #include <asm/xmon.h> |
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 23436b6c1881..6996a593dcb3 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
@@ -66,8 +66,8 @@ | |||
66 | #include <asm/firmware.h> | 66 | #include <asm/firmware.h> |
67 | #endif | 67 | #endif |
68 | #ifdef CONFIG_PPC_ISERIES | 68 | #ifdef CONFIG_PPC_ISERIES |
69 | #include <asm/iSeries/ItLpQueue.h> | 69 | #include <asm/iseries/it_lp_queue.h> |
70 | #include <asm/iSeries/HvCallXm.h> | 70 | #include <asm/iseries/hv_call_xm.h> |
71 | #endif | 71 | #endif |
72 | 72 | ||
73 | /* keep track of when we need to update the rtc */ | 73 | /* keep track of when we need to update the rtc */ |
diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c index 3794715b2972..2a912f411eb4 100644 --- a/arch/powerpc/lib/locks.c +++ b/arch/powerpc/lib/locks.c | |||
@@ -22,7 +22,7 @@ | |||
22 | /* waiting for a spinlock... */ | 22 | /* waiting for a spinlock... */ |
23 | #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES) | 23 | #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES) |
24 | #include <asm/hvcall.h> | 24 | #include <asm/hvcall.h> |
25 | #include <asm/iSeries/HvCall.h> | 25 | #include <asm/iseries/hv_call.h> |
26 | 26 | ||
27 | void __spin_yield(raw_spinlock_t *lock) | 27 | void __spin_yield(raw_spinlock_t *lock) |
28 | { | 28 | { |
diff --git a/arch/powerpc/platforms/iseries/call_hpt.h b/arch/powerpc/platforms/iseries/call_hpt.h index 321f3bb7a8f5..a843b0f87b72 100644 --- a/arch/powerpc/platforms/iseries/call_hpt.h +++ b/arch/powerpc/platforms/iseries/call_hpt.h | |||
@@ -23,8 +23,8 @@ | |||
23 | * drive the hypervisor from the OS. | 23 | * drive the hypervisor from the OS. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <asm/iSeries/HvCallSc.h> | 26 | #include <asm/iseries/hv_call_sc.h> |
27 | #include <asm/iSeries/HvTypes.h> | 27 | #include <asm/iseries/hv_types.h> |
28 | #include <asm/mmu.h> | 28 | #include <asm/mmu.h> |
29 | 29 | ||
30 | #define HvCallHptGetHptAddress HvCallHpt + 0 | 30 | #define HvCallHptGetHptAddress HvCallHpt + 0 |
diff --git a/arch/powerpc/platforms/iseries/call_pci.h b/arch/powerpc/platforms/iseries/call_pci.h index a86e065b9577..59d4e0ad5cf3 100644 --- a/arch/powerpc/platforms/iseries/call_pci.h +++ b/arch/powerpc/platforms/iseries/call_pci.h | |||
@@ -25,8 +25,8 @@ | |||
25 | #ifndef _PLATFORMS_ISERIES_CALL_PCI_H | 25 | #ifndef _PLATFORMS_ISERIES_CALL_PCI_H |
26 | #define _PLATFORMS_ISERIES_CALL_PCI_H | 26 | #define _PLATFORMS_ISERIES_CALL_PCI_H |
27 | 27 | ||
28 | #include <asm/iSeries/HvCallSc.h> | 28 | #include <asm/iseries/hv_call_sc.h> |
29 | #include <asm/iSeries/HvTypes.h> | 29 | #include <asm/iseries/hv_types.h> |
30 | 30 | ||
31 | /* | 31 | /* |
32 | * DSA == Direct Select Address | 32 | * DSA == Direct Select Address |
diff --git a/arch/powerpc/platforms/iseries/call_sm.h b/arch/powerpc/platforms/iseries/call_sm.h index ef223166cf22..c7e251619f48 100644 --- a/arch/powerpc/platforms/iseries/call_sm.h +++ b/arch/powerpc/platforms/iseries/call_sm.h | |||
@@ -23,8 +23,8 @@ | |||
23 | * drive the hypervisor from the OS. | 23 | * drive the hypervisor from the OS. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <asm/iSeries/HvCallSc.h> | 26 | #include <asm/iseries/hv_call_sc.h> |
27 | #include <asm/iSeries/HvTypes.h> | 27 | #include <asm/iseries/hv_types.h> |
28 | 28 | ||
29 | #define HvCallSmGet64BitsOfAccessMap HvCallSm + 11 | 29 | #define HvCallSmGet64BitsOfAccessMap HvCallSm + 11 |
30 | 30 | ||
diff --git a/arch/powerpc/platforms/iseries/hvlog.c b/arch/powerpc/platforms/iseries/hvlog.c index f61e2e9ac9ec..62ec73479687 100644 --- a/arch/powerpc/platforms/iseries/hvlog.c +++ b/arch/powerpc/platforms/iseries/hvlog.c | |||
@@ -9,9 +9,9 @@ | |||
9 | 9 | ||
10 | #include <asm/page.h> | 10 | #include <asm/page.h> |
11 | #include <asm/abs_addr.h> | 11 | #include <asm/abs_addr.h> |
12 | #include <asm/iSeries/HvCall.h> | 12 | #include <asm/iseries/hv_call.h> |
13 | #include <asm/iSeries/HvCallSc.h> | 13 | #include <asm/iseries/hv_call_sc.h> |
14 | #include <asm/iSeries/HvTypes.h> | 14 | #include <asm/iseries/hv_types.h> |
15 | 15 | ||
16 | 16 | ||
17 | void HvCall_writeLogBuffer(const void *buffer, u64 len) | 17 | void HvCall_writeLogBuffer(const void *buffer, u64 len) |
diff --git a/arch/powerpc/platforms/iseries/hvlpconfig.c b/arch/powerpc/platforms/iseries/hvlpconfig.c index dc28621aea0d..663a1affb4bb 100644 --- a/arch/powerpc/platforms/iseries/hvlpconfig.c +++ b/arch/powerpc/platforms/iseries/hvlpconfig.c | |||
@@ -17,7 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
20 | #include <asm/iSeries/HvLpConfig.h> | 20 | #include <asm/iseries/hv_lp_config.h> |
21 | 21 | ||
22 | HvLpIndex HvLpConfig_getLpIndex_outline(void) | 22 | HvLpIndex HvLpConfig_getLpIndex_outline(void) |
23 | { | 23 | { |
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c index 1db26d8be640..1a6845b5c5a4 100644 --- a/arch/powerpc/platforms/iseries/iommu.c +++ b/arch/powerpc/platforms/iseries/iommu.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <asm/machdep.h> | 32 | #include <asm/machdep.h> |
33 | #include <asm/abs_addr.h> | 33 | #include <asm/abs_addr.h> |
34 | #include <asm/pci-bridge.h> | 34 | #include <asm/pci-bridge.h> |
35 | #include <asm/iSeries/HvCallXm.h> | 35 | #include <asm/iseries/hv_call_xm.h> |
36 | 36 | ||
37 | extern struct list_head iSeries_Global_Device_List; | 37 | extern struct list_head iSeries_Global_Device_List; |
38 | 38 | ||
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c index 937ac99b9d33..c1135912cc05 100644 --- a/arch/powerpc/platforms/iseries/irq.c +++ b/arch/powerpc/platforms/iseries/irq.c | |||
@@ -36,9 +36,9 @@ | |||
36 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
37 | 37 | ||
38 | #include <asm/ppcdebug.h> | 38 | #include <asm/ppcdebug.h> |
39 | #include <asm/iSeries/HvTypes.h> | 39 | #include <asm/iseries/hv_types.h> |
40 | #include <asm/iSeries/HvLpEvent.h> | 40 | #include <asm/iseries/hv_lp_event.h> |
41 | #include <asm/iSeries/HvCallXm.h> | 41 | #include <asm/iseries/hv_call_xm.h> |
42 | 42 | ||
43 | #include "irq.h" | 43 | #include "irq.h" |
44 | #include "call_pci.h" | 44 | #include "call_pci.h" |
diff --git a/arch/powerpc/platforms/iseries/ksyms.c b/arch/powerpc/platforms/iseries/ksyms.c index f271b3539721..a2200842f4e5 100644 --- a/arch/powerpc/platforms/iseries/ksyms.c +++ b/arch/powerpc/platforms/iseries/ksyms.c | |||
@@ -9,7 +9,7 @@ | |||
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | 10 | ||
11 | #include <asm/hw_irq.h> | 11 | #include <asm/hw_irq.h> |
12 | #include <asm/iSeries/HvCallSc.h> | 12 | #include <asm/iseries/hv_call_sc.h> |
13 | 13 | ||
14 | EXPORT_SYMBOL(HvCall0); | 14 | EXPORT_SYMBOL(HvCall0); |
15 | EXPORT_SYMBOL(HvCall1); | 15 | EXPORT_SYMBOL(HvCall1); |
diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c index ed2ffee6f731..608431a22607 100644 --- a/arch/powerpc/platforms/iseries/lpardata.c +++ b/arch/powerpc/platforms/iseries/lpardata.c | |||
@@ -15,13 +15,13 @@ | |||
15 | #include <asm/ptrace.h> | 15 | #include <asm/ptrace.h> |
16 | #include <asm/naca.h> | 16 | #include <asm/naca.h> |
17 | #include <asm/abs_addr.h> | 17 | #include <asm/abs_addr.h> |
18 | #include <asm/iSeries/ItLpNaca.h> | 18 | #include <asm/iseries/it_lp_naca.h> |
19 | #include <asm/lppaca.h> | 19 | #include <asm/lppaca.h> |
20 | #include <asm/iSeries/ItLpRegSave.h> | 20 | #include <asm/iseries/it_lp_reg_save.h> |
21 | #include <asm/paca.h> | 21 | #include <asm/paca.h> |
22 | #include <asm/iSeries/LparMap.h> | 22 | #include <asm/iseries/lpar_map.h> |
23 | #include <asm/iSeries/ItExtVpdPanel.h> | 23 | #include <asm/iseries/it_exp_vpd_panel.h> |
24 | #include <asm/iSeries/ItLpQueue.h> | 24 | #include <asm/iseries/it_lp_queue.h> |
25 | 25 | ||
26 | #include "vpd_areas.h" | 26 | #include "vpd_areas.h" |
27 | #include "spcomm_area.h" | 27 | #include "spcomm_area.h" |
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c index 54c7753dbe05..e9fb98bf895f 100644 --- a/arch/powerpc/platforms/iseries/lpevents.c +++ b/arch/powerpc/platforms/iseries/lpevents.c | |||
@@ -17,10 +17,10 @@ | |||
17 | 17 | ||
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/it_lp_queue.h> |
21 | #include <asm/iSeries/HvLpEvent.h> | 21 | #include <asm/iseries/hv_lp_event.h> |
22 | #include <asm/iSeries/HvCallEvent.h> | 22 | #include <asm/iseries/hv_call_event.h> |
23 | #include <asm/iSeries/ItLpNaca.h> | 23 | #include <asm/iseries/it_lp_naca.h> |
24 | 24 | ||
25 | /* | 25 | /* |
26 | * The LpQueue is used to pass event data from the hypervisor to | 26 | * The LpQueue is used to pass event data from the hypervisor to |
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c index e5de31aa0015..49e7e4b85847 100644 --- a/arch/powerpc/platforms/iseries/mf.c +++ b/arch/powerpc/platforms/iseries/mf.c | |||
@@ -38,10 +38,10 @@ | |||
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/HvLpConfig.h> | 43 | #include <asm/iseries/hv_lp_config.h> |
44 | #include <asm/iSeries/ItLpQueue.h> | 44 | #include <asm/iseries/it_lp_queue.h> |
45 | 45 | ||
46 | #include "setup.h" | 46 | #include "setup.h" |
47 | 47 | ||
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c index 959e59fd9c11..7d7d5884343f 100644 --- a/arch/powerpc/platforms/iseries/pci.c +++ b/arch/powerpc/platforms/iseries/pci.c | |||
@@ -36,8 +36,8 @@ | |||
36 | #include <asm/iommu.h> | 36 | #include <asm/iommu.h> |
37 | #include <asm/abs_addr.h> | 37 | #include <asm/abs_addr.h> |
38 | 38 | ||
39 | #include <asm/iSeries/HvCallXm.h> | 39 | #include <asm/iseries/hv_call_xm.h> |
40 | #include <asm/iSeries/mf.h> | 40 | #include <asm/iseries/mf.h> |
41 | 41 | ||
42 | #include <asm/ppc-pci.h> | 42 | #include <asm/ppc-pci.h> |
43 | 43 | ||
diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c index 6f1929cac66b..e68b6b5fa89f 100644 --- a/arch/powerpc/platforms/iseries/proc.c +++ b/arch/powerpc/platforms/iseries/proc.c | |||
@@ -24,8 +24,8 @@ | |||
24 | #include <asm/processor.h> | 24 | #include <asm/processor.h> |
25 | #include <asm/time.h> | 25 | #include <asm/time.h> |
26 | #include <asm/lppaca.h> | 26 | #include <asm/lppaca.h> |
27 | #include <asm/iSeries/ItLpQueue.h> | 27 | #include <asm/iseries/it_lp_queue.h> |
28 | #include <asm/iSeries/HvCallXm.h> | 28 | #include <asm/iseries/hv_call_xm.h> |
29 | 29 | ||
30 | #include "processor_vpd.h" | 30 | #include "processor_vpd.h" |
31 | #include "main_store.h" | 31 | #include "main_store.h" |
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 06431e642533..8e5ef62715bb 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -46,13 +46,13 @@ | |||
46 | #include <asm/cache.h> | 46 | #include <asm/cache.h> |
47 | #include <asm/sections.h> | 47 | #include <asm/sections.h> |
48 | #include <asm/abs_addr.h> | 48 | #include <asm/abs_addr.h> |
49 | #include <asm/iSeries/HvLpConfig.h> | 49 | #include <asm/iseries/hv_lp_config.h> |
50 | #include <asm/iSeries/HvCallEvent.h> | 50 | #include <asm/iseries/hv_call_event.h> |
51 | #include <asm/iSeries/HvCallXm.h> | 51 | #include <asm/iseries/hv_call_xm.h> |
52 | #include <asm/iSeries/ItLpQueue.h> | 52 | #include <asm/iseries/it_lp_queue.h> |
53 | #include <asm/iSeries/mf.h> | 53 | #include <asm/iseries/mf.h> |
54 | #include <asm/iSeries/HvLpEvent.h> | 54 | #include <asm/iseries/hv_lp_event.h> |
55 | #include <asm/iSeries/LparMap.h> | 55 | #include <asm/iseries/lpar_map.h> |
56 | 56 | ||
57 | #include "setup.h" | 57 | #include "setup.h" |
58 | #include "irq.h" | 58 | #include "irq.h" |
diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c index f720916682f6..3336bad67724 100644 --- a/arch/powerpc/platforms/iseries/smp.c +++ b/arch/powerpc/platforms/iseries/smp.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include <asm/io.h> | 38 | #include <asm/io.h> |
39 | #include <asm/smp.h> | 39 | #include <asm/smp.h> |
40 | #include <asm/paca.h> | 40 | #include <asm/paca.h> |
41 | #include <asm/iSeries/HvCall.h> | 41 | #include <asm/iseries/hv_call.h> |
42 | #include <asm/time.h> | 42 | #include <asm/time.h> |
43 | #include <asm/ppcdebug.h> | 43 | #include <asm/ppcdebug.h> |
44 | #include <asm/machdep.h> | 44 | #include <asm/machdep.h> |
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c index c0f7d2e9153f..c27a66876c2c 100644 --- a/arch/powerpc/platforms/iseries/vio.c +++ b/arch/powerpc/platforms/iseries/vio.c | |||
@@ -17,10 +17,10 @@ | |||
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/HvTypes.h> | 21 | #include <asm/iseries/hv_types.h> |
22 | #include <asm/iSeries/HvLpConfig.h> | 22 | #include <asm/iseries/hv_lp_config.h> |
23 | #include <asm/iSeries/HvCallXm.h> | 23 | #include <asm/iseries/hv_call_xm.h> |
24 | 24 | ||
25 | struct device *iSeries_vio_dev = &vio_bus_device.dev; | 25 | struct device *iSeries_vio_dev = &vio_bus_device.dev; |
26 | EXPORT_SYMBOL(iSeries_vio_dev); | 26 | EXPORT_SYMBOL(iSeries_vio_dev); |
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c index c0c767bd37f1..fe97bfbf7463 100644 --- a/arch/powerpc/platforms/iseries/viopath.c +++ b/arch/powerpc/platforms/iseries/viopath.c | |||
@@ -41,12 +41,12 @@ | |||
41 | 41 | ||
42 | #include <asm/system.h> | 42 | #include <asm/system.h> |
43 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
44 | #include <asm/iSeries/HvTypes.h> | 44 | #include <asm/iseries/hv_types.h> |
45 | #include <asm/iSeries/ItExtVpdPanel.h> | 45 | #include <asm/iseries/it_exp_vpd_panel.h> |
46 | #include <asm/iSeries/HvLpEvent.h> | 46 | #include <asm/iseries/hv_lp_event.h> |
47 | #include <asm/iSeries/HvLpConfig.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/arch/powerpc/platforms/iseries/vpdinfo.c b/arch/powerpc/platforms/iseries/vpdinfo.c index 9c318849dee7..23a6d1e5b429 100644 --- a/arch/powerpc/platforms/iseries/vpdinfo.c +++ b/arch/powerpc/platforms/iseries/vpdinfo.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <asm/resource.h> | 32 | #include <asm/resource.h> |
33 | #include <asm/abs_addr.h> | 33 | #include <asm/abs_addr.h> |
34 | #include <asm/pci-bridge.h> | 34 | #include <asm/pci-bridge.h> |
35 | #include <asm/iSeries/HvTypes.h> | 35 | #include <asm/iseries/hv_types.h> |
36 | 36 | ||
37 | #include "pci.h" | 37 | #include "pci.h" |
38 | #include "call_pci.h" | 38 | #include "call_pci.h" |