diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /lib/Makefile | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile index cf98fabaa549..fea8f9035f07 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
| @@ -25,7 +25,7 @@ lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o | |||
| 25 | lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o | 25 | lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o |
| 26 | lib-$(CONFIG_SEMAPHORE_SLEEPERS) += semaphore-sleepers.o | 26 | lib-$(CONFIG_SEMAPHORE_SLEEPERS) += semaphore-sleepers.o |
| 27 | lib-$(CONFIG_GENERIC_FIND_NEXT_BIT) += find_next_bit.o | 27 | lib-$(CONFIG_GENERIC_FIND_NEXT_BIT) += find_next_bit.o |
| 28 | lib-$(CONFIG_GENERIC_HWEIGHT) += hweight.o | 28 | obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o |
| 29 | obj-$(CONFIG_LOCK_KERNEL) += kernel_lock.o | 29 | obj-$(CONFIG_LOCK_KERNEL) += kernel_lock.o |
| 30 | obj-$(CONFIG_PLIST) += plist.o | 30 | obj-$(CONFIG_PLIST) += plist.o |
| 31 | obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o | 31 | obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o |