diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-27 10:21:46 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-27 10:21:46 +0200 |
| commit | 45320bcbabfa9149f43a5beb4b9a4f108dd98929 (patch) | |
| tree | 9909762878ef1390c2570b6157c521fb6a068433 /arch | |
| parent | powerpc: Move cpu_setup_6xx.S and temp.c over to arch/powerpc (diff) | |
| download | linux-45320bcbabfa9149f43a5beb4b9a4f108dd98929.tar.xz linux-45320bcbabfa9149f43a5beb4b9a4f108dd98929.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/swsusp_32.S (renamed from arch/ppc/kernel/swsusp.S) | 0 | ||||
| -rw-r--r-- | arch/ppc/kernel/Makefile | 2 |
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 obj-y := entry.o traps.o time.o misc.o \ setup.o \ ppc_htab.o -obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o obj-$(CONFIG_PCI) += pci.o @@ -32,7 +31,6 @@ endif # These are here while we do the architecture merge else -obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o obj-$(CONFIG_KGDB) += ppc-stub.o |