Michal Simek 968766a7e8 spi: Fix merge conflicts - Makefile ...

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

and the patch "Merge branch 'master' of git://git.denx.de/u-boot-microblaze"
(sha1: d978780b2e)

has wrongly resolved confict.

This patch fix it.

Signed-off-by: Michal Simek <monstr@monstr.eu>

2012-08-07 23:08:14 +02:00

2.1 KiB

Raw Blame History

View Raw