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,
Denis Turischev <denis@compulab•co.il>,
Samuel Ortiz <sameo@linux•intel.com>,
Thomas Gleixner <tglx@linutronix•de>
Subject: linux-next: manual merge of the spi tree with the mfd tree
Date: Fri, 18 Mar 2011 15:40:17 +1100 [thread overview]
Message-ID: <20110318154017.e45aa888.sfr@canb.auug.org.au> (raw)
Hi Grant,
Today's linux-next merge of the spi tree got a conflict in
drivers/gpio/Kconfig between commit 390ff13830e5 ("gpio: Add Tunnel Creek
support to sch_gpio") from the mfd tree and commit 61ab3fe57e45 ("gpio;
Make Intel chipset gpio drivers depend on x86") from the spi tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary. I am assuming that the Tunnel Creek stuff should also depend
on X86?
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/gpio/Kconfig
index 7ef9108,b46442d..0000000
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -100,8 -100,8 +100,8 @@@ config GPIO_VR41X
Say yes here to support the NEC VR4100 series General-purpose I/O Uint
config GPIO_SCH
- tristate "Intel SCH GPIO"
+ tristate "Intel SCH/TunnelCreek GPIO"
- depends on GPIOLIB && PCI
+ depends on GPIOLIB && PCI && X86
select MFD_CORE
select LPC_SCH
help
next reply other threads:[~2011-03-18 4:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-18 4:40 Stephen Rothwell [this message]
2011-03-18 5:16 ` linux-next: manual merge of the spi tree with the mfd tree Grant Likely
2011-03-22 11:05 ` Samuel Ortiz
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=20110318154017.e45aa888.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=denis@compulab$(echo .)co.il \
--cc=grant.likely@secretlab$(echo .)ca \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sameo@linux$(echo .)intel.com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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