diff options
-rw-r--r-- | arch/powerpc/kernel/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/kernel/vio.c (renamed from arch/ppc64/kernel/vio.c) | 0 | ||||
-rw-r--r-- | arch/ppc64/kernel/Makefile | 1 |
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 6b0f176265..f5d8038fed 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 | |||
16 | obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o | 16 | obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o |
17 | obj-$(CONFIG_POWER4) += idle_power4.o | 17 | obj-$(CONFIG_POWER4) += idle_power4.o |
18 | obj-$(CONFIG_PPC_OF) += of_device.o | 18 | obj-$(CONFIG_PPC_OF) += of_device.o |
19 | obj-$(CONFIG_IBMVIO) += vio.o | ||
19 | 20 | ||
20 | ifeq ($(CONFIG_PPC_MERGE),y) | 21 | ifeq ($(CONFIG_PPC_MERGE),y) |
21 | 22 | ||
diff --git a/arch/ppc64/kernel/vio.c b/arch/powerpc/kernel/vio.c index 0e555b7a65..0e555b7a65 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 424dd250cd..ce5c99db43 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
@@ -53,7 +53,6 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o | |||
53 | endif | 53 | endif |
54 | obj-$(CONFIG_HVCS) += hvcserver.o | 54 | obj-$(CONFIG_HVCS) += hvcserver.o |
55 | 55 | ||
56 | obj-$(CONFIG_IBMVIO) += vio.o | ||
57 | obj-$(CONFIG_XICS) += xics.o | 56 | obj-$(CONFIG_XICS) += xics.o |
58 | 57 | ||
59 | obj-$(CONFIG_PPC_PMAC) += udbg_scc.o | 58 | obj-$(CONFIG_PPC_PMAC) += udbg_scc.o |