From: Wolfgang Denk <wd@denx.de>
Date: Tue, 7 Jul 2009 20:22:05 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2009.08-rc1~118
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a48ecc969f8d2d0fe9167962e9b8b4cca52de10b;p=pandora-u-boot.git

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

Conflicts:
	drivers/spi/Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

a48ecc969f8d2d0fe9167962e9b8b4cca52de10b
diff --cc drivers/spi/Makefile
index 1272c17761a,7ffa47db5c3..a9f67a0ac0d
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@ -28,7 -28,7 +28,8 @@@ LIB	:= $(obj)libspi.
  COBJS-$(CONFIG_ATMEL_DATAFLASH_SPI) += atmel_dataflash_spi.o
  COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o
  COBJS-$(CONFIG_BFIN_SPI) += bfin_spi.o
+ COBJS-$(CONFIG_KIRKWOOD_SPI) += kirkwood_spi.o
 +COBJS-$(CONFIG_MPC52XX_SPI) += mpc52xx_spi.o
  COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o
  COBJS-$(CONFIG_MXC_SPI) += mxc_spi.o
  COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o