aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-03-27 03:21:46 -0500
committerPaul Mackerras <paulus@samba.org>2006-03-27 03:21:46 -0500
commit45320bcbabfa9149f43a5beb4b9a4f108dd98929 (patch)
tree9909762878ef1390c2570b6157c521fb6a068433
parent9b781727fd1062671afa144b93e8c69b14bcac4d (diff)
powerpc: Move swsusp.S over to arch/powerpc
... and rename it to swsusp_32.S, since it's 32-bit only at this stage. Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/swsusp_32.S (renamed from arch/ppc/kernel/swsusp.S)0
-rw-r--r--arch/ppc/kernel/Makefile2
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/ppc/kernel/swsusp.S b/arch/powerpc/kernel/swsusp_32.S
index 69773cc1a85f..69773cc1a85f 100644
--- a/arch/ppc/kernel/swsusp.S
+++ b/arch/powerpc/kernel/swsusp_32.S
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index d6a4863d4e7c..8ac1dd958415 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -13,7 +13,6 @@ extra-y += vmlinux.lds
13obj-y := entry.o traps.o time.o misc.o \ 13obj-y := entry.o traps.o time.o misc.o \
14 setup.o \ 14 setup.o \
15 ppc_htab.o 15 ppc_htab.o
16obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
17obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o 16obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o
18obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o 17obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
19obj-$(CONFIG_PCI) += pci.o 18obj-$(CONFIG_PCI) += pci.o
@@ -32,7 +31,6 @@ endif
32# These are here while we do the architecture merge 31# These are here while we do the architecture merge
33 32
34else 33else
35obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
36obj-$(CONFIG_MODULES) += module.o 34obj-$(CONFIG_MODULES) += module.o
37obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o 35obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
38obj-$(CONFIG_KGDB) += ppc-stub.o 36obj-$(CONFIG_KGDB) += ppc-stub.o