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

Commit 58046019 authored Oct 24, 2005 by Stephen Rothwell

powerpc: Merge arch/ppc64/kernel/vio.c into arch/powerpc/kernel/vio.c



Merge arch/ppc64/kernel/vio.c into arch/powerpc/kernel/vio.c, update
the Makefiles to make it work, and make ARCH=ppc64 still work.

Michael's version put vio.c in arch/powerpc/sysedv but after consolting
Paulus, this one puts it in arch/powerpc/kernel.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

parent 85e568ea

arch/powerpc/kernel/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ obj-$(CONFIG_PPC64) += binfmt_elf32.o sys_ppc32.o ptrace32.o
		obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
		obj-$(CONFIG_POWER4) += idle_power4.o
		obj-$(CONFIG_PPC_OF) += of_device.o
		obj-$(CONFIG_IBMVIO) += vio.o

		ifeq ($(CONFIG_PPC_MERGE),y)

arch/ppc64/kernel/vio.c→arch/powerpc/kernel/vio.c

+0 −0

File moved.

arch/ppc64/kernel/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o
		endif
		obj-$(CONFIG_HVCS) += hvcserver.o

		obj-$(CONFIG_IBMVIO) += vio.o
		obj-$(CONFIG_XICS) += xics.o

		obj-$(CONFIG_PPC_PMAC) += udbg_scc.o