From: Wolfgang Denk <wd@denx.de>
Date: Tue, 25 Nov 2008 10:40:57 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-ubi
X-Git-Tag: v2009.01-rc1~65
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f9b354faa0417b7f8888de246ff5f267f7cb17f2;p=oweals%2Fu-boot.git

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

f9b354faa0417b7f8888de246ff5f267f7cb17f2
diff --cc drivers/mtd/Makefile
index 47687d0e04,d225a6810c..b665a97f15
--- a/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