From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Erik Gilling <konkers@android.com>,
Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
Masayuki Ohtake <masa-korg@dsn.okisemi.com>
Subject: linux-next: manual merge of the spi tree with the tegra tree
Date: Fri, 15 Oct 2010 13:25:34 +1100 [thread overview]
Message-ID: <20101015132534.f95d5a42.sfr@canb.auug.org.au> (raw)
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@canb.auug.org.au
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
next reply other threads:[~2010-10-15 2:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-15 2:25 Stephen Rothwell [this message]
2010-10-15 3:15 ` linux-next: manual merge of the spi tree with the tegra tree Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101015132534.f95d5a42.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ccross@android.com \
--cc=grant.likely@secretlab.ca \
--cc=konkers@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masa-korg@dsn.okisemi.com \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox