aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/Makefile
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-24 00:22:37 -0400
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-24 01:41:44 -0400
commit580460194e0e647d95cb5a2b66fdd7497b197f92 (patch)
treebce8e2c26e02c01210f6aa82fed9a9772bdf6fd6 /arch/powerpc/kernel/Makefile
parent85e568ea5843d455a0bcb682ad2c71abb50bdb80 (diff)
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>
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
-rw-r--r--arch/powerpc/kernel/Makefile1
1 files changed, 1 insertions, 0 deletions
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
16obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o 16obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
17obj-$(CONFIG_POWER4) += idle_power4.o 17obj-$(CONFIG_POWER4) += idle_power4.o
18obj-$(CONFIG_PPC_OF) += of_device.o 18obj-$(CONFIG_PPC_OF) += of_device.o
19obj-$(CONFIG_IBMVIO) += vio.o
19 20
20ifeq ($(CONFIG_PPC_MERGE),y) 21ifeq ($(CONFIG_PPC_MERGE),y)
21 22