linux-next: manual merge of the gpio tree with the xtensa tree

[Stephen Rothwell]

Hi Linus,

Today's linux-next merge of the gpio tree got a conflict in
arch/xtensa/Kconfig between commit dbacef090841 ("xtensa: add SMP
support") from the xtensa tree and commit a1a2bdec4772 ("gpio: xtensa:
depend on HAVE_XTENSA_GPIO32") from the gpio tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/xtensa/Kconfig
index 70a160be3464,f8df0cc70cb6..000000000000
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -64,9 -64,9 +64,12 @@@ config MM
  config VARIANT_IRQ_SWITCH
  	def_bool n
  
 +config MAY_HAVE_SMP
 +	def_bool n
 +
+ config HAVE_XTENSA_GPIO32
+ 	def_bool n
+ 
  menu "Processor type and features"
  
  choice

Attachment: pgp00000.pgp
Description: PGP signature