diff options
| author | Michal Simek <monstr@monstr.eu> | 2012-08-03 03:37:44 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-08-07 23:08:14 +0200 |
| commit | 968766a7e81e76c94d6cc485d7cd435fee885b83 (patch) | |
| tree | 5ef48e15b6266874d7f8a062bed969784c49377e /drivers | |
| parent | 94c1a20fe78c0d3ba44ee8674b91163dddad0d80 (diff) | |
| download | blackbird-obmc-uboot-968766a7e81e76c94d6cc485d7cd435fee885b83.tar.gz blackbird-obmc-uboot-968766a7e81e76c94d6cc485d7cd435fee885b83.zip | |
spi: Fix merge conflicts - Makefile
The patch "spi: tegra2: rename tegra2_spi.* to tegra_spi.*"
(sha1: edffa63d3d6e76991998789f9fcbaa483731ca65)
renamed tegra2_spi.c to tegra_spi.c
and the patch "Merge branch 'master' of git://git.denx.de/u-boot-microblaze"
(sha1: d978780b2e676c005460cd561f4f15b5220bdf49)
has wrongly resolved confict.
This patch fix it.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index cd3f9fa856..80b981f10f 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -44,7 +44,6 @@ COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o COBJS-$(CONFIG_SH_SPI) += sh_spi.o COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o COBJS-$(CONFIG_TEGRA_SPI) += tegra_spi.o -COBJS-$(CONFIG_TEGRA2_SPI) += tegra2_spi.o COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o COBJS := $(COBJS-y) |
