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

Commit d9953105 authored Oct 24, 2005 by Michael Ellerman Committed by Paul Mackerras Oct 26, 2005

[PATCH] powerpc: Move ras.c into arch/powerpc/platforms/pseries



ras.o is only built for CONFIG_PPC_PSERIES, so move it into
arch/powerpc/platforms/pseries. Update Makefiles to suit.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent 21f35f28

arch/powerpc/platforms/pseries/Makefile

+1 −1

Original line number	Diff line number	Diff line
		obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \
		setup.o iommu.o
		setup.o iommu.o ras.o
		obj-$(CONFIG_SMP) += smp.o
		obj-$(CONFIG_IBMVIO) += vio.o

arch/ppc64/kernel/ras.c→arch/powerpc/platforms/pseries/ras.c

+5 −6

Original line number	Diff line number	Diff line
		/*
		* ras.c
		* Copyright (C) 2001 Dave Engebretsen IBM Corporation
		*
		* This program is free software; you can redistribute it and/or modify

arch/ppc64/kernel/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ ifneq ($(CONFIG_PPC_MERGE),y)
		obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o
		endif

		obj-$(CONFIG_PPC_PSERIES) += rtasd.o ras.o udbg_16550.o
		obj-$(CONFIG_PPC_PSERIES) += rtasd.o udbg_16550.o

		obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \
		bpa_iic.o spider-pic.o