aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/Makefile1
-rw-r--r--arch/powerpc/kernel/vio.c (renamed from arch/ppc64/kernel/vio.c)0
-rw-r--r--arch/ppc64/kernel/Makefile1
3 files changed, 1 insertions, 1 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
diff --git a/arch/ppc64/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 0e555b7a6587..0e555b7a6587 100644
--- a/arch/ppc64/kernel/vio.c
+++ b/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
53endif 53endif
54obj-$(CONFIG_HVCS) += hvcserver.o 54obj-$(CONFIG_HVCS) += hvcserver.o
55 55
56obj-$(CONFIG_IBMVIO) += vio.o
57obj-$(CONFIG_XICS) += xics.o 56obj-$(CONFIG_XICS) += xics.o
58 57
59obj-$(CONFIG_PPC_PMAC) += udbg_scc.o 58obj-$(CONFIG_PPC_PMAC) += udbg_scc.o