diff options
| author | Kelly Daly | 2005-11-02 15:02:47 +1100 |
|---|---|---|
| committer | Kelly Daly | 2005-11-02 15:02:47 +1100 |
| commit | c43a55ff4e55d1bcfdf0cadfe2f00281e156c436 (patch) | |
| tree | b6ca4cd30ab00fa3bb2a6de16b6c76066b0d6ddd | |
| parent | 59ce20bb341282d5ecf17fd8b0ac093dd6350e5e (diff) | |
merge filename and modify references to iseries/lpar_map.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| -rw-r--r-- | arch/powerpc/kernel/head_64.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/lparmap.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/lpardata.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 2 | ||||
| -rw-r--r-- | arch/ppc64/kernel/head.S | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/iseries/lpar_map.h (renamed from include/asm-ppc64/iSeries/LparMap.h) | 0 |
6 files changed, 5 insertions, 5 deletions
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 @@ #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/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 @@ */ #include <asm/mmu.h> #include <asm/page.h> -#include <asm/iSeries/LparMap.h> +#include <asm/iseries/lpar_map.h> const struct LparMap __attribute__((__section__(".text"))) xLparMap = { .xNumberEsids = HvEsidsToMap, diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c index 6cd25b9b5e5a..608431a22607 100644 --- a/arch/powerpc/platforms/iseries/lpardata.c +++ b/arch/powerpc/platforms/iseries/lpardata.c @@ -19,7 +19,7 @@ #include <asm/lppaca.h> #include <asm/iseries/it_lp_reg_save.h> #include <asm/paca.h> -#include <asm/iSeries/LparMap.h> +#include <asm/iseries/lpar_map.h> #include <asm/iseries/it_exp_vpd_panel.h> #include <asm/iseries/it_lp_queue.h> diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 9a9e54b736d3..758f5b50628a 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c @@ -51,7 +51,7 @@ #include <asm/iseries/it_lp_queue.h> #include <asm/iSeries/mf.h> #include <asm/iseries/hv_lp_event.h> -#include <asm/iSeries/LparMap.h> +#include <asm/iseries/lpar_map.h> #include "setup.h" #include "irq.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/include/asm-ppc64/iSeries/LparMap.h b/include/asm-powerpc/iseries/lpar_map.h index a6840b186d03..a6840b186d03 100644 --- a/include/asm-ppc64/iSeries/LparMap.h +++ b/include/asm-powerpc/iseries/lpar_map.h |