Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8303dd3 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6

parents bfa274e2 74b20dad

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ config PPC 
	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_KPROBES

	select HAVE_LMB



config EARLY_PRINTK

	bool

arch/powerpc/kernel/btext.c

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/string.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/lmb.h>



#include <asm/sections.h>

#include <asm/prom.h>
@@ -15,7 +16,7 @@ 
#include <asm/mmu.h>

#include <asm/pgtable.h>

#include <asm/io.h>

#include <asm/lmb.h>

#include <asm/prom.h>

#include <asm/processor.h>

#include <asm/udbg.h>

arch/powerpc/kernel/crash.c

+2 −1
Original line number Diff line number Diff line
@@ -24,12 +24,13 @@ 
#include <linux/init.h>

#include <linux/irq.h>

#include <linux/types.h>

#include <linux/lmb.h>



#include <asm/processor.h>

#include <asm/machdep.h>

#include <asm/kexec.h>

#include <asm/kdump.h>

#include <asm/lmb.h>

#include <asm/prom.h>

#include <asm/firmware.h>

#include <asm/smp.h>

#include <asm/system.h>

arch/powerpc/kernel/crash_dump.c

+2 −1
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ 


#include <linux/crash_dump.h>

#include <linux/bootmem.h>

#include <linux/lmb.h>

#include <asm/kdump.h>

#include <asm/lmb.h>

#include <asm/prom.h>

#include <asm/firmware.h>

#include <asm/uaccess.h>

arch/powerpc/kernel/machine_kexec.c

+2 −1
Original line number Diff line number Diff line
@@ -12,8 +12,9 @@ 
#include <linux/kexec.h>

#include <linux/reboot.h>

#include <linux/threads.h>

#include <linux/lmb.h>

#include <asm/machdep.h>

#include <asm/lmb.h>

#include <asm/prom.h>



void machine_crash_shutdown(struct pt_regs *regs)

{