linux-kernel - linux-next: manual merge of the spi tree with the mfd tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110318154017.e45aa888.sfr@canb.auug.org.au>
Date:	Fri, 18 Mar 2011 15:40:17 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Denis Turischev <denis@...pulab.co.il>,
	Samuel Ortiz <sameo@...ux.intel.com>,
	Thomas Gleixner <tglx@...utronix.de>
Subject: linux-next: manual merge of the spi tree with the mfd tree

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@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/