From: Mark Brown <broonie@kernel.org>
Date: Mon, 8 Dec 2014 12:17:15 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/fsl-espi', 'spi/topic... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dcf695b5f30e22063e85e27e77e18cc998a17fb1;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/topic/img-spfi' and 'spi/topic/meson' into spi-next
---

dcf695b5f30e22063e85e27e77e18cc998a17fb1
diff --cc drivers/spi/Makefile
index 78f24ca36fcf,78f24ca36fcf,78f24ca36fcf,78f24ca36fcf,37dc2e7d2c7e,9b8a7472b5b8..6b9d2ac629cc
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@@@@@ -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