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

Commit 38407aad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Fix "unused variable" warning in pci_dlpar.c
  powerpc/cell: Fix compile error in ras.c
  powerpc/ps3: Fix compile error in ps3-lpm.c
parents 39d4e58d 454666eb

arch/powerpc/platforms/cell/ras.c

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

#include <linux/crash_dump.h>



#include <asm/kexec.h>

#include <asm/reg.h>

#include <asm/io.h>

#include <asm/prom.h>

arch/powerpc/platforms/pseries/pci_dlpar.c

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn) 
{

	struct pci_controller *phb;

	int primary;

	struct pci_bus *b;



	primary = list_empty(&hose_list);

	phb = pcibios_alloc_controller(dn);

drivers/ps3/ps3-lpm.c

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

#include <linux/interrupt.h>

#include <linux/uaccess.h>

#include <asm/smp.h>

#include <asm/time.h>

#include <asm/ps3.h>

#include <asm/lv1call.h>