Merge

diff --cc drivers/base/Makefile
index eae7bc965fcb57fe7851b7564e29d0aa6dd219fa,94756ce763e080767d48cbf7210b087b5583fb8d..12518e7465431479cc32327378fd0f394882c9b6
--- 1/drivers/base/Makefile
--- 2/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@@ -1,7 -1,7 +1,7 @@@
- O_TARGET      := base.o
+ # Makefile for the Linux device tree
  
 -obj-y         := core.o sys.o interface.o fs.o power.o
 +obj-y         := core.o sys.o interface.o fs.o power.o bus.o 
  
 -export-objs   := core.o fs.o power.o sys.o
 +export-objs   := core.o fs.o power.o sys.o bus.o
  
  include $(TOPDIR)/Rules.make