Subject: linux-next: manual merge of the pcmcia tree with the pxa tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 30 Nov 2009 13:16:21 +1100

Hi Dominik,

Today's linux-next merge of the pcmcia tree got a conflict in
drivers/pcmcia/Kconfig between commit
c9b74a4489db7e6fe03fbee11f406b9641baae55 ("[ARM] pxa/zeus: make Viper
pcmcia support more generic to support Zeus") from the pxa tree and
commit 0f767de6a26a07f7d58394512b6f6c96322f047f ("PCMCIA: soc_common:
convert to a stand alone module") from the pcmcia tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/pcmcia/Kconfig
index d3faec3,f3ccbcc..0000000
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@@ -242,7 -208,8 +229,8 @@@ config PCMCIA_PXA2X
  	depends on ARM && ARCH_PXA && PCMCIA
  	depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
  		    || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
 -		    || ARCH_VIPER || ARCH_PXA_ESERIES || MACH_STARGATE2)
 +		    || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2)
+ 	select PCMCIA_SOC_COMMON
  	help
  	  Say Y here to include support for the PXA2xx PCMCIA controller