diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-07 23:03:11 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-07 23:03:11 -0500 |
| commit | d5112a4f31a361409d3c57dc9d58dd69f8014bef (patch) | |
| tree | 64771300b2191cb94d9aaf60355661a01c2ccd1a /arch/powerpc/lib | |
| parent | 12e86f92fcfe4f0bcab0ad7fa4088a64c60d9b38 (diff) | |
| parent | 5fad293bcbd48d9a2370020cf60e4b4a42559b12 (diff) | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.21
Diffstat (limited to 'arch/powerpc/lib')
| -rw-r--r-- | arch/powerpc/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index e2d414160c83..4b1ba49fbd9e 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
| @@ -16,11 +16,11 @@ obj-$(CONFIG_PPC64) += checksum_64.o copypage_64.o copyuser_64.o \ | |||
| 16 | strcase.o | 16 | strcase.o |
| 17 | obj-$(CONFIG_QUICC_ENGINE) += rheap.o | 17 | obj-$(CONFIG_QUICC_ENGINE) += rheap.o |
| 18 | obj-$(CONFIG_XMON) += sstep.o | 18 | obj-$(CONFIG_XMON) += sstep.o |
| 19 | obj-$(CONFIG_KPROBES) += sstep.o | ||
| 19 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o | 20 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o |
| 20 | 21 | ||
| 21 | ifeq ($(CONFIG_PPC64),y) | 22 | ifeq ($(CONFIG_PPC64),y) |
| 22 | obj-$(CONFIG_SMP) += locks.o | 23 | obj-$(CONFIG_SMP) += locks.o |
| 23 | obj-$(CONFIG_DEBUG_KERNEL) += sstep.o | ||
| 24 | endif | 24 | endif |
| 25 | 25 | ||
| 26 | # Temporary hack until we have migrated to asm-powerpc | 26 | # Temporary hack until we have migrated to asm-powerpc |