diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-03 15:35:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-03 15:35:00 +1100 |
| commit | a2a53568286c011fa5c174b607dfab74c9df7be6 (patch) | |
| tree | 97f7cc3803ef7c1792f80f1ba442b066103bb642 /lib | |
| parent | f9d0fb0c641df05b7773c0c41bb8efebf6669f0d (diff) | |
| parent | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (diff) | |
Merge commit 'security-testing/next'
Conflicts:
fs/cifs/cifs_fs_sb.h
fs/nfsd/nfs4recover.c
fs/ocfs2/namei.c
fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/xfs_vnodeops.h
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile index cc8335a921e7..0a65a53ae56f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -11,7 +11,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ rbtree.o radix-tree.o dump_stack.o \ idr.o int_sqrt.o extable.o prio_tree.o \ sha1.o irq_regs.o reciprocal_div.o argv_split.o \ - proportions.o prio_heap.o ratelimit.o show_mem.o + proportions.o prio_heap.o ratelimit.o show_mem.o is_single_threaded.o lib-$(CONFIG_MMU) += ioremap.o lib-$(CONFIG_SMP) += cpumask.o |