Merge

diff --cc drivers/pcmcia/Kconfig
Simple merge

diff --cc drivers/pcmcia/Makefile
index 450d524a967914509be485ea430b15b28181116c,f89f77485fbc994ee6d035d394883aacf1581d6a..1ddf0c08c6bb41e4a27512e2e8a1e9c42d31d3eb
--- 1/drivers/pcmcia/Makefile
--- 2/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@@ -17,12 -26,7 +26,9 @@@ obj-$(CONFIG_HD64465_PCMCIA)                 += hd644
  obj-$(CONFIG_PCMCIA_SA1100)                   += sa11xx_core.o sa1100_cs.o
  obj-$(CONFIG_PCMCIA_SA1111)                   += sa11xx_core.o sa1111_cs.o
  obj-$(CONFIG_PCMCIA_PXA2XX)                     += pxa2xx_core.o pxa2xx_cs.o
 +obj-$(CONFIG_M32R_PCC)                                += m32r_pcc.o
 +obj-$(CONFIG_M32R_CFC)                                += m32r_cfc.o
  
- pcmcia_core-y                                 += cistpl.o rsrc_mgr.o bulkmem.o cs.o socket_sysfs.o
- pcmcia_core-$(CONFIG_CARDBUS)                 += cardbus.o
- 
  sa11xx_core-y                                 += soc_common.o sa11xx_base.o
  pxa2xx_core-y                                 += soc_common.o pxa2xx_base.o