From 5797c974f86d5f26cfef041159b2589612b811c3 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Mon, 27 Mar 2006 19:21:46 +1100 Subject: [PATCH] --- yaml --- r: 24629 b: refs/heads/master c: 45320bcbabfa9149f43a5beb4b9a4f108dd98929 h: refs/heads/master i: 24627: a234219752f23ac302ea053d11394b9291b690ce v: v3 --- [refs] | 2 +- trunk/arch/{ppc/kernel/swsusp.S => powerpc/kernel/swsusp_32.S} | 0 trunk/arch/ppc/kernel/Makefile | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) rename trunk/arch/{ppc/kernel/swsusp.S => powerpc/kernel/swsusp_32.S} (100%) diff --git a/[refs] b/[refs] index 60ec392ffd30..d2d89c7549bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b781727fd1062671afa144b93e8c69b14bcac4d +refs/heads/master: 45320bcbabfa9149f43a5beb4b9a4f108dd98929 diff --git a/trunk/arch/ppc/kernel/swsusp.S b/trunk/arch/powerpc/kernel/swsusp_32.S similarity index 100% rename from trunk/arch/ppc/kernel/swsusp.S rename to trunk/arch/powerpc/kernel/swsusp_32.S diff --git a/trunk/arch/ppc/kernel/Makefile b/trunk/arch/ppc/kernel/Makefile index d6a4863d4e7c..8ac1dd958415 100644 --- a/trunk/arch/ppc/kernel/Makefile +++ b/trunk/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