Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/fsl-espi', 'spi/topic...
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 12:17:15 +0000 (12:17 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 12:17:15 +0000 (12:17 +0000)
1  2  3  4  5  6 
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/spi-fsl-dspi.c

Simple merge
@@@@@@@ -40,8 -40,8 -40,8 -40,8 -40,9 -40,9 +40,10 @@@@@@@ obj-$(CONFIG_SPI_FSL_LIB)            += spi-fsl-l
      obj-$(CONFIG_SPI_FSL_ESPI)                += spi-fsl-espi.o
      obj-$(CONFIG_SPI_FSL_SPI)         += spi-fsl-spi.o
      obj-$(CONFIG_SPI_GPIO)                    += spi-gpio.o
++++ +obj-$(CONFIG_SPI_IMG_SPFI)                += spi-img-spfi.o
      obj-$(CONFIG_SPI_IMX)                     += spi-imx.o
      obj-$(CONFIG_SPI_LM70_LLP)                += spi-lm70llp.o
+++++ obj-$(CONFIG_SPI_MESON_SPIFC)             += spi-meson-spifc.o
      obj-$(CONFIG_SPI_MPC512x_PSC)             += spi-mpc512x-psc.o
      obj-$(CONFIG_SPI_MPC52xx_PSC)             += spi-mpc52xx-psc.o
      obj-$(CONFIG_SPI_MPC52xx)         += spi-mpc52xx.o
Simple merge