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

Commit d387899f authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

powerpc: Move iSeries_pci.c to powerpc/platform/iseries 



and rename it to pci.c.  This also required moving
arch/ppc64/kernel/pci.h into include/asm-powerpc (called
ppc-pci.h.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent cc14d430

arch/powerpc/platforms/iseries/Makefile

+1 −0
Original line number Original line Diff line number Diff line 
obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \

obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \

	hvcall.o proc.o htab.o iommu.o

	hvcall.o proc.o htab.o iommu.o

obj-$(CONFIG_PCI) += pci.o

arch/ppc64/kernel/iSeries_pci.c→arch/powerpc/platforms/iseries/pci.c

+32 −34
Original line number Original line Diff line number Diff line 
/*

/*

 * iSeries_pci.c

 *

 * Copyright (C) 2001 Allan Trautman, IBM Corporation

 * Copyright (C) 2001 Allan Trautman, IBM Corporation

 *

 *

 * iSeries specific routines for PCI.

 * iSeries specific routines for PCI.
@@ -43,7 +41,7 @@ 
#include <asm/iSeries/iSeries_pci.h>

#include <asm/iSeries/iSeries_pci.h>

#include <asm/iSeries/mf.h>

#include <asm/iSeries/mf.h>





#include "pci.h"

#include <asm/ppc-pci.h>





extern unsigned long io_page_mask;

extern unsigned long io_page_mask;

arch/ppc64/kernel/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ obj-y += vdso32/ vdso64/ 




obj-$(CONFIG_PPC_OF) +=	of_device.o

obj-$(CONFIG_PPC_OF) +=	of_device.o





pci-obj-$(CONFIG_PPC_ISERIES)	+= iSeries_pci.o iSeries_irq.o \

pci-obj-$(CONFIG_PPC_ISERIES)	+= iSeries_irq.o \

				iSeries_VpdInfo.o

				iSeries_VpdInfo.o

pci-obj-$(CONFIG_PPC_MULTIPLATFORM)	+= pci_dn.o pci_direct_iommu.o

pci-obj-$(CONFIG_PPC_MULTIPLATFORM)	+= pci_dn.o pci_direct_iommu.o

arch/ppc64/kernel/bpa_iommu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,8 +39,8 @@ 
#include <asm/pmac_feature.h>

#include <asm/pmac_feature.h>

#include <asm/abs_addr.h>

#include <asm/abs_addr.h>

#include <asm/system.h>

#include <asm/system.h>

#include <asm/ppc-pci.h>





#include "pci.h"

#include "bpa_iommu.h"

#include "bpa_iommu.h"





static inline unsigned long 

static inline unsigned long

arch/ppc64/kernel/bpa_setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,8 +43,8 @@ 
#include <asm/time.h>

#include <asm/time.h>

#include <asm/nvram.h>

#include <asm/nvram.h>

#include <asm/cputable.h>

#include <asm/cputable.h>

#include <asm/ppc-pci.h>





#include "pci.h"

#include "bpa_iic.h"

#include "bpa_iic.h"

#include "bpa_iommu.h"

#include "bpa_iommu.h"