diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-07-14 03:27:26 -0400 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-07-14 03:27:26 -0400 |
| commit | 790e05d8c2b9941218c7c9ffb5c318382fab0a8b (patch) | |
| tree | efc88203419278fbe9aa6ebbf3b74738abf573f2 /arch/powerpc/kernel | |
| parent | 20697cb775bdd0271f3c90fad2d15c065fd19488 (diff) | |
| parent | ca652c9396fa052815518e2b2ce2ebee6d9fb861 (diff) | |
Merge branch 'mpe'
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/lparcfg.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c index 23f34daa044a..2d94b372d49b 100644 --- a/arch/powerpc/kernel/lparcfg.c +++ b/arch/powerpc/kernel/lparcfg.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <asm/rtas.h> | 32 | #include <asm/rtas.h> |
| 33 | #include <asm/system.h> | 33 | #include <asm/system.h> |
| 34 | #include <asm/time.h> | 34 | #include <asm/time.h> |
| 35 | #include <asm/iseries/it_exp_vpd_panel.h> | ||
| 36 | #include <asm/prom.h> | 35 | #include <asm/prom.h> |
| 37 | #include <asm/vdso_datapage.h> | 36 | #include <asm/vdso_datapage.h> |
| 38 | 37 | ||
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index fd1785e4c9bb..e2447aef3a8f 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -56,7 +56,6 @@ | |||
| 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/it_lp_naca.h> | ||
| 60 | #include <asm/firmware.h> | 59 | #include <asm/firmware.h> |
| 61 | #include <asm/xmon.h> | 60 | #include <asm/xmon.h> |
| 62 | #include <asm/udbg.h> | 61 | #include <asm/udbg.h> |