Commit 968766a7 authored by Michal Simek's avatar Michal Simek Committed by Wolfgang Denk
Browse files

spi: Fix merge conflicts - Makefile

The patch "spi: tegra2: rename tegra2_spi.* to tegra_spi.*"
(sha1: edffa63d)
renamed tegra2_spi.c to tegra_spi.c

and the patch "Merge branch 'master' of git://"
(sha1: d978780b


has wrongly resolved confict.

This patch fix it.
Signed-off-by: default avatarMichal Simek <>
parent 94c1a20f
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment