Merge iSeries include file move

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/ppc64
parent: 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff)
parent: ecb3ca2783d6e54d30dbf70a42fe995c27eeb212 (diff)
5 files changed, 6 insertions, 6 deletions
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 @@
 #include <asm/paca.h>
 #include <asm/lppaca.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/rtas.h>
 #include <asm/cputable.h>
 #include <asm/cache.h>
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
index 929f9f42cf7a..0b65efe1682e 100644
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -35,7 +35,7 @@
 #include <asm/cputable.h>
 #include <asm/setup.h>
 #include <asm/hvcall.h>
-#include <asm/iSeries/LparMap.h>
+#include <asm/iseries/lpar_map.h>
 #include <asm/thread_info.h>
 #ifdef CONFIG_PPC_ISERIES
diff --git a/arch/ppc64/kernel/irq.c b/arch/ppc64/kernel/irq.c
index b072ed6f77ad..87474584033f 100644
--- a/arch/ppc64/kernel/irq.c
+++ b/arch/ppc64/kernel/irq.c
@@ -52,7 +52,7 @@
 #include <asm/cache.h>
 #include <asm/prom.h>
 #include <asm/ptrace.h>
-#include <asm/iSeries/ItLpQueue.h>
+#include <asm/iseries/it_lp_queue.h>
 #include <asm/machdep.h>
 #include <asm/paca.h>
diff --git a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c
index cae19bbd5acd..e86155770bbc 100644
--- a/arch/ppc64/kernel/lparcfg.c
+++ b/arch/ppc64/kernel/lparcfg.c
@@ -26,14 +26,14 @@
 #include <linux/init.h>
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 #include <asm/lppaca.h>
 #include <asm/hvcall.h>
 #include <asm/firmware.h>
 #include <asm/rtas.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/iSeries/ItExtVpdPanel.h>
+#include <asm/iseries/it_exp_vpd_panel.h>
 #include <asm/prom.h>
 #define MODULE_VERS "1.6"
diff --git a/arch/ppc64/kernel/pacaData.c b/arch/ppc64/kernel/pacaData.c
index 33a2d8db3f21..5e27e5a6a35d 100644
--- a/arch/ppc64/kernel/pacaData.c
+++ b/arch/ppc64/kernel/pacaData.c
@@ -17,7 +17,7 @@
 #include <asm/page.h>
 #include <asm/lppaca.h>
-#include <asm/iSeries/ItLpQueue.h>
+#include <asm/iseries/it_lp_queue.h>
 #include <asm/paca.h>
 static union {
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/ppc64
parent	104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff)
parent	ecb3ca2783d6e54d30dbf70a42fe995c27eeb212 (diff)

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/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S index 929f9f42cf7a..0b65efe1682e 100644 --- a/arch/ppc64/kernel/head.S +++ b/arch/ppc64/kernel/head.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/ppc64/kernel/irq.c b/arch/ppc64/kernel/irq.c index b072ed6f77ad..87474584033f 100644 --- a/arch/ppc64/kernel/irq.c +++ b/arch/ppc64/kernel/irq.c
@@ -52,7 +52,7 @@
52	#include <asm/cache.h>	52	#include <asm/cache.h>
53	#include <asm/prom.h>	53	#include <asm/prom.h>
54	#include <asm/ptrace.h>	54	#include <asm/ptrace.h>
55	#include <asm/iSeries/ItLpQueue.h>	55	#include <asm/iseries/it_lp_queue.h>
56	#include <asm/machdep.h>	56	#include <asm/machdep.h>
57	#include <asm/paca.h>	57	#include <asm/paca.h>
58		58


diff --git a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c index cae19bbd5acd..e86155770bbc 100644 --- a/arch/ppc64/kernel/lparcfg.c +++ b/arch/ppc64/kernel/lparcfg.c
@@ -26,14 +26,14 @@
26	#include <linux/init.h>	26	#include <linux/init.h>
27	#include <linux/seq_file.h>	27	#include <linux/seq_file.h>
28	#include <asm/uaccess.h>	28	#include <asm/uaccess.h>
29	#include <asm/iSeries/HvLpConfig.h>	29	#include <asm/iseries/hv_lp_config.h>
30	#include <asm/lppaca.h>	30	#include <asm/lppaca.h>
31	#include <asm/hvcall.h>	31	#include <asm/hvcall.h>
32	#include <asm/firmware.h>	32	#include <asm/firmware.h>
33	#include <asm/rtas.h>	33	#include <asm/rtas.h>
34	#include <asm/system.h>	34	#include <asm/system.h>
35	#include <asm/time.h>	35	#include <asm/time.h>
36	#include <asm/iSeries/ItExtVpdPanel.h>	36	#include <asm/iseries/it_exp_vpd_panel.h>
37	#include <asm/prom.h>	37	#include <asm/prom.h>
38		38
39	#define MODULE_VERS "1.6"	39	#define MODULE_VERS "1.6"


diff --git a/arch/ppc64/kernel/pacaData.c b/arch/ppc64/kernel/pacaData.c index 33a2d8db3f21..5e27e5a6a35d 100644 --- a/arch/ppc64/kernel/pacaData.c +++ b/arch/ppc64/kernel/pacaData.c
@@ -17,7 +17,7 @@
17	#include <asm/page.h>	17	#include <asm/page.h>
18		18
19	#include <asm/lppaca.h>	19	#include <asm/lppaca.h>
20	#include <asm/iSeries/ItLpQueue.h>	20	#include <asm/iseries/it_lp_queue.h>
21	#include <asm/paca.h>	21	#include <asm/paca.h>
22		22
23	static union {	23	static union {