diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-22 23:15:51 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-27 03:23:00 -0400 |
commit | ba0dd617a3e23321a14cb38ff7ad6f796ba32c34 (patch) | |
tree | 22c600620587cc1927215bdf61b88d1613336066 /arch | |
parent | 6b67f62cf655c80147435544a2f8f6f57e07ec87 (diff) |
powerpc: Create arch/powerpc/platforms/iseries
I also move arch/ppc64/kernel/HvCall.c to
arch/powerpc/platforms/iseries/hvcall.c.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/Makefile | 9 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/hvcall.c (renamed from arch/ppc64/kernel/HvCall.c) | 1 | ||||
-rw-r--r-- | arch/ppc64/Makefile | 1 | ||||
-rw-r--r-- | arch/ppc64/kernel/Makefile | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile index dbc093759a89..697addea192f 100644 --- a/arch/powerpc/platforms/Makefile +++ b/arch/powerpc/platforms/Makefile | |||
@@ -1,4 +1,5 @@ | |||
1 | obj-$(CONFIG_PPC_PMAC) += powermac/ | 1 | obj-$(CONFIG_PPC_PMAC) += powermac/ |
2 | obj-$(CONFIG_4xx) += 4xx/ | 2 | obj-$(CONFIG_4xx) += 4xx/ |
3 | obj-$(CONFIG_83xx) += 83xx/ | 3 | obj-$(CONFIG_83xx) += 83xx/ |
4 | obj-$(CONFIG_85xx) += 85xx/ | 4 | obj-$(CONFIG_85xx) += 85xx/ |
5 | obj-$(CONFIG_PPC_ISERIES) += iseries/ | ||
diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile new file mode 100644 index 000000000000..af0c7d97121d --- /dev/null +++ b/arch/powerpc/platforms/iseries/Makefile | |||
@@ -0,0 +1 @@ | |||
obj-$(CONFIG_PPC_ISERIES) += hvcall.o | |||
diff --git a/arch/ppc64/kernel/HvCall.c b/arch/powerpc/platforms/iseries/hvcall.c index b772e65b57a2..f61e2e9ac9ec 100644 --- a/arch/ppc64/kernel/HvCall.c +++ b/arch/powerpc/platforms/iseries/hvcall.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * HvCall.c | ||
3 | * Copyright (C) 2001 Mike Corrigan IBM Corporation | 2 | * Copyright (C) 2001 Mike Corrigan IBM Corporation |
4 | * | 3 | * |
5 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile index 40675b3f924d..d4eb55f82f03 100644 --- a/arch/ppc64/Makefile +++ b/arch/ppc64/Makefile | |||
@@ -84,6 +84,7 @@ head-y := arch/ppc64/kernel/head.o | |||
84 | libs-y += arch/ppc64/lib/ | 84 | libs-y += arch/ppc64/lib/ |
85 | core-y += arch/ppc64/kernel/ | 85 | core-y += arch/ppc64/kernel/ |
86 | core-y += arch/ppc64/mm/ | 86 | core-y += arch/ppc64/mm/ |
87 | core-y += arch/powerpc/platforms/ | ||
87 | core-$(CONFIG_XMON) += arch/ppc64/xmon/ | 88 | core-$(CONFIG_XMON) += arch/ppc64/xmon/ |
88 | drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ | 89 | drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ |
89 | 90 | ||
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index afadb6e4a6dc..aba3895b74d4 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
@@ -22,7 +22,7 @@ pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o | |||
22 | 22 | ||
23 | obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y) | 23 | obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y) |
24 | 24 | ||
25 | obj-$(CONFIG_PPC_ISERIES) += HvCall.o HvLpConfig.o LparData.o \ | 25 | obj-$(CONFIG_PPC_ISERIES) += HvLpConfig.o LparData.o \ |
26 | iSeries_setup.o ItLpQueue.o hvCall.o \ | 26 | iSeries_setup.o ItLpQueue.o hvCall.o \ |
27 | mf.o HvLpEvent.o iSeries_proc.o iSeries_htab.o \ | 27 | mf.o HvLpEvent.o iSeries_proc.o iSeries_htab.o \ |
28 | iSeries_iommu.o | 28 | iSeries_iommu.o |