| Message ID | 1344001064-762-1-git-send-email-monstr@monstr.eu |
|---|---|
| State | Accepted |
| Commit | 968766a7e81e76c94d6cc485d7cd435fee885b83 |
| Headers | show |
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
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)
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(-)