linux-kernel - linux-next: manual merge of the mfd tree with Linus' 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: <20100812144135.4834268b.sfr@canb.auug.org.au>
Date:	Thu, 12 Aug 2010 14:41:35 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Samuel Ortiz <sameo@...ux.intel.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Gregory Bean <gbean@...eaurora.org>,
	Rabin Vincent <rabin.vincent@...ricsson.com>
Subject: linux-next: manual merge of the mfd tree with Linus' tree

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/gpio/Kconfig between commit
c34f16b70a52e348a62944fe0d5c7c1eb9ad5b72 ("gpio: sx150x: add Semtech I2C
sx150x gpio expander driver") from Linus' tree and commit
59d11276842199a8ee525f1e88be7eafe8614e4c ("gpio: Add STMPE GPIO driver")
from the mfd tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/gpio/Kconfig
index f623953,38d6910..0000000
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -195,17 -195,13 +195,24 @@@ config GPIO_PCF857
  	  This driver provides an in-kernel interface to those GPIOs using
  	  platform-neutral GPIO calls.
  
 +config GPIO_SX150X
 +	bool "Semtech SX150x I2C GPIO expander"
 +	depends on I2C=y
 +	default n
 +	help
 +	  Say yes here to provide support for Semtech SX150-series I2C
 +	  GPIO expanders. Compatible models include:
 +
 +	  8 bits:  sx1508q
 +	  16 bits: sx1509q
 +
+ config GPIO_STMPE
+ 	bool "STMPE GPIOs"
+ 	depends on MFD_STMPE
+ 	help
+ 	  This enables support for the GPIOs found on the STMPE I/O
+ 	  Expanders.
+ 
  config GPIO_TC35892
  	bool "TC35892 GPIOs"
  	depends on MFD_TC35892
--
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/