diff options
| -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 | |||
| 13 | obj-y := entry.o traps.o time.o misc.o \ | 13 | obj-y := entry.o traps.o time.o misc.o \ |
| 14 | setup.o \ | 14 | setup.o \ |
| 15 | ppc_htab.o | 15 | ppc_htab.o |
| 16 | obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o | ||
| 17 | obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o | 16 | obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o |
| 18 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o | 17 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o |
| 19 | obj-$(CONFIG_PCI) += pci.o | 18 | obj-$(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 | ||
| 34 | else | 33 | else |
| 35 | obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o | ||
| 36 | obj-$(CONFIG_MODULES) += module.o | 34 | obj-$(CONFIG_MODULES) += module.o |
| 37 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o | 35 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o |
| 38 | obj-$(CONFIG_KGDB) += ppc-stub.o | 36 | obj-$(CONFIG_KGDB) += ppc-stub.o |
