diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-14 11:52:20 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-14 11:52:20 +1000 |
commit | 5457b752accdb01966746281475153f81d37d4b2 (patch) | |
tree | 8fe4f513a9ffdccb7c2669e6c38b4bb0346b634c /kernel/Makefile | |
parent | d9b2bd7d98173f867489582e3ee9647a7b76bda7 (diff) | |
parent | 28457ee69c473a903e51e26c7bcd6f1e9eceb93e (diff) |
Merge remote branch 'rcu/rcu/next'
Diffstat (limited to 'kernel/Makefile')
-rw-r--r-- | kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 0b72d1a74be0..17046b6e7c90 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -86,6 +86,7 @@ obj-$(CONFIG_TREE_RCU) += rcutree.o obj-$(CONFIG_TREE_PREEMPT_RCU) += rcutree.o obj-$(CONFIG_TREE_RCU_TRACE) += rcutree_trace.o obj-$(CONFIG_TINY_RCU) += rcutiny.o +obj-$(CONFIG_TINY_PREEMPT_RCU) += rcutiny.o obj-$(CONFIG_RELAY) += relay.o obj-$(CONFIG_SYSCTL) += utsname_sysctl.o obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o |