Merge branch 'master' of git://git.denx.de/u-boot-ubi

diff --cc drivers/mtd/Makefile
index 47687d0,d225a68..b665a97
--- 1/drivers/mtd/Makefile
--- 2/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@@ -25,9 -25,9 +25,10 @@@ include $(TOPDIR)/config.m
  
  LIB   := $(obj)libmtd.a
  
+ COBJS-$(CONFIG_CMD_UBI) += mtdcore.o mtdpart.o
  COBJS-$(CONFIG_HAS_DATAFLASH) += at45.o
  COBJS-$(CONFIG_FLASH_CFI_DRIVER) += cfi_flash.o
 +COBJS-$(CONFIG_FLASH_CFI_MTD) += cfi_mtd.o
  COBJS-$(CONFIG_HAS_DATAFLASH) += dataflash.o
  COBJS-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o
  COBJS-$(CONFIG_MW_EEPROM) += mw_eeprom.o