diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 14:39:09 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 14:39:09 +0200 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /arch/ppc64/kernel/lparcfg.c | |
| parent | AUDIT: Use KERN_NOTICE for printk of audit records (diff) | |
| parent | [PATCH] alpha smp fix (part #2) (diff) | |
| download | linux-d2f6409584e2c62ffad81690562330ff3bf4a458.tar.xz linux-d2f6409584e2c62ffad81690562330ff3bf4a458.zip | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc64/kernel/lparcfg.c')
| -rw-r--r-- | arch/ppc64/kernel/lparcfg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c index a8fd32df848b..02e96627fa66 100644 --- a/arch/ppc64/kernel/lparcfg.c +++ b/arch/ppc64/kernel/lparcfg.c @@ -28,12 +28,13 @@ #include <asm/uaccess.h> #include <asm/iSeries/HvLpConfig.h> #include <asm/lppaca.h> -#include <asm/iSeries/LparData.h> #include <asm/hvcall.h> #include <asm/cputable.h> #include <asm/rtas.h> #include <asm/system.h> #include <asm/time.h> +#include <asm/iSeries/ItExtVpdPanel.h> +#include <asm/prom.h> #define MODULE_VERS "1.6" #define MODULE_NAME "lparcfg" |