diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 16:06:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 16:06:03 +1100 |
| commit | aaf8a7a2949481482200686c7bd3852e5be2e093 (patch) | |
| tree | 76d4dde7c42cd3a3a9dea94f7f18a0817bb9b644 /arch/ppc64/kernel | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | ecb3ca2783d6e54d30dbf70a42fe995c27eeb212 (diff) | |
| download | op-kernel-dev-aaf8a7a2949481482200686c7bd3852e5be2e093.zip op-kernel-dev-aaf8a7a2949481482200686c7bd3852e5be2e093.tar.gz | |
Merge iSeries include file move
Diffstat (limited to 'arch/ppc64/kernel')
| -rw-r--r-- | arch/ppc64/kernel/asm-offsets.c | 2 | ||||
| -rw-r--r-- | arch/ppc64/kernel/head.S | 2 | ||||
| -rw-r--r-- | arch/ppc64/kernel/irq.c | 2 | ||||
| -rw-r--r-- | arch/ppc64/kernel/lparcfg.c | 4 | ||||
| -rw-r--r-- | arch/ppc64/kernel/pacaData.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/ppc64/kernel/asm-offsets.c b/arch/ppc64/kernel/asm-offsets.c index 5e6046c..504dee8 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 929f9f4..0b65efe 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 b072ed6..8747458 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 cae19bb..e861557 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 33a2d8d..5e27e5a 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 { |
