diff options
-rw-r--r-- | arch/powerpc/platforms/iseries/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/viopath.c (renamed from arch/ppc64/kernel/viopath.c) | 3 | ||||
-rw-r--r-- | arch/ppc64/kernel/Makefile | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile index 202f17419df5..5a27b888103c 100644 --- a/arch/powerpc/platforms/iseries/Makefile +++ b/arch/powerpc/platforms/iseries/Makefile | |||
@@ -3,3 +3,4 @@ obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \ | |||
3 | obj-$(CONFIG_PCI) += pci.o irq.o vpdinfo.o | 3 | obj-$(CONFIG_PCI) += pci.o irq.o vpdinfo.o |
4 | obj-$(CONFIG_IBMVIO) += vio.o | 4 | obj-$(CONFIG_IBMVIO) += vio.o |
5 | obj-$(CONFIG_SMP) += smp.o | 5 | obj-$(CONFIG_SMP) += smp.o |
6 | obj-$(CONFIG_VIOPATH) += viopath.o | ||
diff --git a/arch/ppc64/kernel/viopath.c b/arch/powerpc/platforms/iseries/viopath.c index 2a6c4f01c45e..c0c767bd37f1 100644 --- a/arch/ppc64/kernel/viopath.c +++ b/arch/powerpc/platforms/iseries/viopath.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* -*- linux-c -*- | 1 | /* -*- linux-c -*- |
2 | * arch/ppc64/kernel/viopath.c | ||
3 | * | 2 | * |
4 | * iSeries Virtual I/O Message Path code | 3 | * iSeries Virtual I/O Message Path code |
5 | * | 4 | * |
@@ -7,7 +6,7 @@ | |||
7 | * Ryan Arnold <ryanarn@us.ibm.com> | 6 | * Ryan Arnold <ryanarn@us.ibm.com> |
8 | * Colin Devilbiss <devilbis@us.ibm.com> | 7 | * Colin Devilbiss <devilbis@us.ibm.com> |
9 | * | 8 | * |
10 | * (C) Copyright 2000-2003 IBM Corporation | 9 | * (C) Copyright 2000-2005 IBM Corporation |
11 | * | 10 | * |
12 | * This code is used by the iSeries virtual disk, cd, | 11 | * This code is used by the iSeries virtual disk, cd, |
13 | * tape, and console to communicate with OS/400 in another | 12 | * tape, and console to communicate with OS/400 in another |
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index ee88fca0c886..bb5946b88b8b 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
@@ -38,7 +38,6 @@ obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o | |||
38 | obj-$(CONFIG_PPC_RTAS) += rtas.o rtas_pci.o | 38 | obj-$(CONFIG_PPC_RTAS) += rtas.o rtas_pci.o |
39 | obj-$(CONFIG_RTAS_PROC) += rtas-proc.o | 39 | obj-$(CONFIG_RTAS_PROC) += rtas-proc.o |
40 | obj-$(CONFIG_SCANLOG) += scanlog.o | 40 | obj-$(CONFIG_SCANLOG) += scanlog.o |
41 | obj-$(CONFIG_VIOPATH) += viopath.o | ||
42 | obj-$(CONFIG_LPARCFG) += lparcfg.o | 41 | obj-$(CONFIG_LPARCFG) += lparcfg.o |
43 | obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o | 42 | obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o |
44 | obj-$(CONFIG_BOOTX_TEXT) += btext.o | 43 | obj-$(CONFIG_BOOTX_TEXT) += btext.o |