From: Paul Mackerras <paulus@samba.org>
Date: Wed, 12 Oct 2005 04:43:32 +0000 (+1000)
Subject: Merge from Linus' tree
X-Git-Tag: v2.6.15-rc1~59^2~184
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b6ec995a21a9428aef620b5adf46d047a18d88b8;p=linux.git

Merge from Linus' tree
---

b6ec995a21a9428aef620b5adf46d047a18d88b8
diff --cc arch/powerpc/platforms/pseries/pci.c
index 2dd477eb1c53,928f8febdb3b..c198656a3bb5
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@@ -29,9 -29,10 +29,9 @@@
  
  #include <asm/pci-bridge.h>
  #include <asm/prom.h>
 -
 -#include "pci.h"
 +#include <asm/ppc-pci.h>
  
- static int __initdata s7a_workaround = -1;
+ static int __devinitdata s7a_workaround = -1;
  
  #if 0
  void pcibios_name_device(struct pci_dev *dev)
diff --cc arch/ppc64/kernel/pci_direct_iommu.c
index 57980a5674d7,54055c81017a..e1a32f802c0b
--- a/arch/ppc64/kernel/pci_direct_iommu.c
+++ b/arch/ppc64/kernel/pci_direct_iommu.c
@@@ -27,10 -27,11 +27,10 @@@
  #include <asm/machdep.h>
  #include <asm/pmac_feature.h>
  #include <asm/abs_addr.h>
 -
 -#include "pci.h"
 +#include <asm/ppc-pci.h>
  
  static void *pci_direct_alloc_coherent(struct device *hwdev, size_t size,
- 				   dma_addr_t *dma_handle, unsigned int __nocast flag)
+ 				   dma_addr_t *dma_handle, gfp_t flag)
  {
  	void *ret;