Merge branch 'omap-pool'

Conflicts:
	drivers/Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 3db0a27a914a64cfcc1dffa3040b47af2946fca3..9efb73cbf2e446c97a53f9649bd78b24f1b48b45 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -34,6 +34,8 @@ obj-$(CONFIG_CONNECTOR)               += connector/
 obj-$(CONFIG_FB_I810)           += video/i810/
 obj-$(CONFIG_FB_INTEL)          += video/intelfb/
 
+obj-y                          += cbus/
+
 # we also need input/serio early so serio bus is initialized by the time
 # serial drivers start registering their serio ports
 obj-$(CONFIG_SERIO)            += input/serio/