Patchwork [U-Boot] spi: Fix merge conflicts - Makefile

login
register
mail settings
Submitter Michal Simek
Date Aug. 3, 2012, 1:37 p.m.
Message ID <1344001064-762-1-git-send-email-monstr@monstr.eu>
Download mbox | patch
Permalink /patch/174991/
State Accepted
Commit 968766a7e81e76c94d6cc485d7cd435fee885b83
Headers show

Comments

Michal Simek - Aug. 3, 2012, 1:37 p.m.
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>
---
 drivers/spi/Makefile |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
Wolfgang Denk - Aug. 7, 2012, 9:08 p.m.
Dear Michal Simek,

In message <1344001064-762-1-git-send-email-monstr@monstr.eu> you wrote:
> 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>
> ---
>  drivers/spi/Makefile |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index cd3f9fa..80b981f 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)