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

..

altera_spi.c

altera_spi: add spi_set_speed

2011-02-08 08:29:53 -05:00

andes_spi.c

andes_spi: add andes_spi interface

2011-07-25 23:40:11 +02:00

andes_spi.h

andes_spi: add andes_spi interface

2011-07-25 23:40:11 +02:00

armada100_spi.c

SPI: Add SPI driver support for Marvell Armada100

2011-10-27 21:56:32 +02:00

atmel_dataflash_spi.c

AT91/SPI: fix atmel_dataflash_spi.c to allow building without warnings

2011-08-03 13:00:56 +02:00

atmel_spi.c

drivers/spi/atmel_spi.c: Fix GCC 4.6 warning

2011-11-16 21:28:25 +01:00

atmel_spi.h

atmel_spi: Driver for the Atmel SPI controller

2008-06-03 20:30:05 +02:00

bfin_spi.c

Blackfin: bfin_spi: fix build error when DEBUG is defined

2011-10-16 14:22:19 -04:00

cf_spi.c

add CONFIG_SPI_IDLE_VAL for cf_spi.c to allow use of spi_mmc

2011-04-13 06:35:22 -05:00

davinci_spi.c

Davinci: SPI: add the missing v2 patch changes

2010-07-05 20:00:40 -04:00

davinci_spi.h

TI DaVinci: Driver for the davinci SPI controller

2010-02-12 12:31:53 -06:00

fsl_espi.c

GCC4.6: Squash warnings in fsl_espi.c

2011-10-27 23:54:05 +02:00

kirkwood_spi.c

kw_spi: add weak functions board_spi_claim/release_bus

2012-07-07 14:07:32 +02:00

Makefile

spi: Fix merge conflicts - Makefile

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

mpc8xxx_spi.c

Move arch/ppc to arch/powerpc

2010-04-21 23:42:38 +02:00

mpc52xx_spi.c

mpc52xx: Add SPI driver.

2009-06-14 23:01:38 +02:00

mxc_spi.c

mxc_spi: move machine specifics into CPU headers

2012-02-27 21:19:23 +01:00

mxs_spi.c

spi: mxs: Allow other chip selects to work

2012-05-15 08:31:35 +02:00

oc_tiny_spi.c

spi: add new driver for OpenCores tiny_spi

2011-04-30 20:58:36 +02:00

omap3_spi.c

omap3_spi: receive transmit mode

2012-03-27 22:05:29 +02:00

omap3_spi.h

omap3_spi: receive transmit mode

2012-03-27 22:05:29 +02:00

sh_spi.c

sh_spi: Add 4 chip select signals supporting

2012-03-26 10:09:31 +09:00

sh_spi.h

sh_spi: Add 4 chip select signals supporting

2012-03-26 10:09:31 +09:00

soft_spi.c

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

tegra_spi.c

spi: tegra2: rename tegra2_spi.* to tegra_spi.*

2012-07-07 14:07:20 +02:00

xilinx_spi.c

spi: microblaze: Adds driver for Xilinx SPI controller

2012-07-31 07:14:04 +02:00

xilinx_spi.h

spi: microblaze: Adds driver for Xilinx SPI controller

2012-07-31 07:14:04 +02:00