Merge branch 'omap-pool'

Conflicts:
	drivers/Makefile

diff --combined drivers/Makefile
index 3db0a27a914a64cfcc1dffa3040b47af2946fca3,625f69d8ecdc7f618e96e06efd0eba2edaaf03a3..9efb73cbf2e446c97a53f9649bd78b24f1b48b45
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -34,6 -34,8 +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/
@@@ -41,7 -43,6 +43,7 @@@ obj-y                         += serial
  obj-$(CONFIG_PARPORT)         += parport/
  obj-y                         += base/ block/ misc/ mfd/ media/
  obj-y                         += i2c/
 +obj-y                         += cbus/
  obj-$(CONFIG_NUBUS)           += nubus/
  obj-y                         += macintosh/
  obj-$(CONFIG_IDE)             += ide/