diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-27 17:18:28 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-27 17:18:28 -0400 |
| commit | 4e6d816e51728d5006c53e78e079ac62b902f8aa (patch) | |
| tree | d388c87dabc063c08c52d17610738d2f49b3855c /arch/powerpc/lib | |
| parent | d86d9b8cab45adf64e2ea8fe975bec3282b5de81 (diff) | |
| parent | 611a15afcdaacec6efba984c7eb089b853564bdf (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux-2.6-PQ
Diffstat (limited to 'arch/powerpc/lib')
| -rw-r--r-- | arch/powerpc/lib/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 336dd191f76..8030f6245d8 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
| @@ -20,3 +20,8 @@ ifeq ($(CONFIG_PPC64),y) | |||
| 20 | obj-$(CONFIG_SMP) += locks.o | 20 | obj-$(CONFIG_SMP) += locks.o |
| 21 | obj-$(CONFIG_DEBUG_KERNEL) += sstep.o | 21 | obj-$(CONFIG_DEBUG_KERNEL) += sstep.o |
| 22 | endif | 22 | endif |
| 23 | |||
| 24 | # Temporary hack until we have migrated to asm-powerpc | ||
| 25 | ifeq ($(CONFIG_PPC_MERGE),y) | ||
| 26 | obj-$(CONFIG_CPM2) += rheap.o | ||
| 27 | endif | ||