linux-next: manual merge of the spi tree with the tegra tree

[Stephen Rothwell]

Hi Grant,

Today's linux-next merge of the spi tree got a conflict in
drivers/spi/Kconfig drivers/spi/Makefile between commit
f4fe02ee997ac4dca9d0888d1d1b8ceb29aae7d6 ("spi: add spi_tegra driver")
from the tegra tree and commit e8b17b5b3f30252b5470dbbf54bc251ddc7fac17
("spi/topcliff: Add topcliff platform controller hub (PCH) spi bus
driver") from the spi tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/spi/Kconfig
index b806078,9949c25..0000000
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -314,13 -313,13 +329,20 @@@ config SPI_STMP3XX
  	help
  	  SPI driver for Freescale STMP37xx/378x SoC SSP interface
  
 +config SPI_TEGRA
 +	tristate "Nvidia Tegra SPI controller"
 +	depends on ARCH_TEGRA
 +	select TEGRA_SYSTEM_DMA
 +	help
 +	  SPI driver for NVidia Tegra SoCs
 +
+ config SPI_TOPCLIFF_PCH
+ 	tristate "Topcliff PCH SPI Controller"
+ 	depends on PCI
+ 	help
+ 	  SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus
+ 	  used in some x86 embedded processors.
+ 
  config SPI_TXX9
  	tristate "Toshiba TXx9 SPI controller"
  	depends on GENERIC_GPIO && CPU_TX49XX
diff --cc drivers/spi/Makefile
index b6573d8,557aaad..0000000
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@ -39,7 -39,7 +39,8 @@@ obj-$(CONFIG_SPI_PPC4xx)		+= spi_ppc4xx
  obj-$(CONFIG_SPI_S3C24XX_GPIO)		+= spi_s3c24xx_gpio.o
  obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24xx_hw.o
  obj-$(CONFIG_SPI_S3C64XX)		+= spi_s3c64xx.o
 +obj-$(CONFIG_SPI_TEGRA)			+= spi_tegra.o
+ obj-$(CONFIG_SPI_TOPCLIFF_PCH)		+= spi_topcliff_pch.o
  obj-$(CONFIG_SPI_TXX9)			+= spi_txx9.o
  obj-$(CONFIG_SPI_XILINX)		+= xilinx_spi.o
  obj-$(CONFIG_SPI_XILINX_OF)		+= xilinx_spi_of.o
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/