Merge from Linus' tree
authorPaul Mackerras <paulus@samba.org>
Wed, 12 Oct 2005 04:43:32 +0000 (14:43 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 12 Oct 2005 04:43:32 +0000 (14:43 +1000)
22 files changed:
1  2 
arch/powerpc/platforms/pseries/pci.c
arch/ppc/platforms/4xx/ebony.c
arch/ppc/platforms/chestnut.c
arch/ppc/platforms/chrp_setup.c
arch/ppc/platforms/gemini_setup.c
arch/ppc/platforms/pmac_cpufreq.c
arch/ppc/platforms/pmac_feature.c
arch/ppc/platforms/pmac_setup.c
arch/ppc/platforms/pmac_time.c
arch/ppc/platforms/pplus.c
arch/ppc/platforms/radstone_ppc7d.c
arch/ppc/platforms/sandpoint.c
arch/ppc/syslib/open_pic.c
arch/ppc/syslib/open_pic2.c
arch/ppc/syslib/ppc4xx_setup.c
arch/ppc64/kernel/bpa_iommu.c
arch/ppc64/kernel/kprobes.c
arch/ppc64/kernel/pci_direct_iommu.c
arch/ppc64/kernel/pci_iommu.c
drivers/macintosh/smu.c
include/asm-ppc/io.h
include/asm-ppc64/iommu.h

index 2dd477eb1c53506b10ef4867e0dbe3c1a5a575ee,928f8febdb3b88ef96881c4908233b6d84a6540a..c198656a3bb5723faae617ec52406a17a718ff02
  
  #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)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 57980a5674d772ce4a1e8c90b53cef3395719d9c,54055c81017a614b2379686e3d1b1a4a8bce7161..e1a32f802c0b38c1a7c065286ed4ed5e25495490
  #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;
  
Simple merge
Simple merge
Simple merge
Simple merge