From 580460194e0e647d95cb5a2b66fdd7497b197f92 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Oct 2005 14:22:37 +1000
Subject: [PATCH] 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>
---
arch/powerpc/kernel/Makefile | 1 +
arch/{ppc64 => powerpc}/kernel/vio.c | 0
arch/ppc64/kernel/Makefile | 1 -
3 files changed, 1 insertion(+), 1 deletion(-)
rename arch/{ppc64 => powerpc}/kernel/vio.c (100%)
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 6b0f176265e3..f5d8038fed52 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -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)
diff --git a/arch/ppc64/kernel/vio.c b/arch/powerpc/kernel/vio.c
similarity index 100%
rename from arch/ppc64/kernel/vio.c
rename to arch/powerpc/kernel/vio.c
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 424dd250cd87..ce5c99db431f 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -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