diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
| commit | 28b4d5cc17c20786848cdc07b7ea237a309776bb (patch) | |
| tree | bae406a4b17229dcce7c11be5073f7a67665e477 /kernel/Makefile | |
| parent | d29cecda036f251aee4947f47eea0fe9ed8cc931 (diff) | |
| parent | 96fa2b508d2d3fe040cf4ef2fffb955f0a537ea1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/ray_cs.c
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 d7c13d249b2d..dcf6789bf547 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
| @@ -82,6 +82,7 @@ obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o | |||
| 82 | obj-$(CONFIG_TREE_RCU) += rcutree.o | 82 | obj-$(CONFIG_TREE_RCU) += rcutree.o |
| 83 | obj-$(CONFIG_TREE_PREEMPT_RCU) += rcutree.o | 83 | obj-$(CONFIG_TREE_PREEMPT_RCU) += rcutree.o |
| 84 | obj-$(CONFIG_TREE_RCU_TRACE) += rcutree_trace.o | 84 | obj-$(CONFIG_TREE_RCU_TRACE) += rcutree_trace.o |
| 85 | obj-$(CONFIG_TINY_RCU) += rcutiny.o | ||
| 85 | obj-$(CONFIG_RELAY) += relay.o | 86 | obj-$(CONFIG_RELAY) += relay.o |
| 86 | obj-$(CONFIG_SYSCTL) += utsname_sysctl.o | 87 | obj-$(CONFIG_SYSCTL) += utsname_sysctl.o |
| 87 | obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o | 88 | obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o |