From: Wolfgang Denk <wd@denx.de>
Date: Mon, 13 Jul 2009 21:45:02 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2009.08-rc1~110^2^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c3ae126c2cad03f04be36c92dd9437b9ee2385b6;p=oweals%2Fu-boot.git

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

c3ae126c2cad03f04be36c92dd9437b9ee2385b6
diff --cc drivers/mtd/nand/Makefile
index c1325b905d,d4d3948532..a5680e80ee
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@@ -40,12 -40,12 +40,13 @@@ COBJS-$(CONFIG_DRIVER_NAND_BFIN) += bfi
  COBJS-$(CONFIG_NAND_DAVINCI) += davinci_nand.o
  COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o
  COBJS-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
+ COBJS-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
  COBJS-$(CONFIG_NAND_MPC5121_NFC) += mpc5121_nfc.o
  COBJS-$(CONFIG_NAND_NOMADIK) += nomadik.o
 -COBJS-$(CONFIG_NAND_S3C2410) += s3c2410_nand.c
 +COBJS-$(CONFIG_NAND_S3C2410) += s3c2410_nand.o
  COBJS-$(CONFIG_NAND_S3C64XX) += s3c64xx.o
  COBJS-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
 +COBJS-$(CONFIG_NAND_PLAT) += nand_plat.o
  endif
  
  COBJS	:= $(COBJS-y)