Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-block.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index 13af308f2460325c392997d2aa08cdc499310354..07737e50fe6e6ec2c35d8a40794a535e7d4a71b0 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -26,6 +26,7 @@ obj-y += power/
 obj-y += printk/
 obj-y += irq/
 obj-y += rcu/
+obj-y += livepatch/
 
 obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
 obj-$(CONFIG_FREEZER) += freezer.o