Merge tag 'pcmcia-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux

Pull PCMCIA updates from Dominik Brodowski:
 "A number of minor PCMCIA bugfixes and cleanups, and a patch removing
  obsolete host controller drivers"

* tag 'pcmcia-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: remove obsolete host controller drivers
  pcmcia: Convert to use less arguments in pci_bus_for_each_resource()
  PCMCIA: Fix garbled log messages for KERN_CONT

Author: torvalds

arch/mips/configs/mtx1_defconfig

@@ -15,7 +15,6 @@ CONFIG_PCI=y
 CONFIG_PCCARD=m
 CONFIG_YENTA=m
 CONFIG_PD6729=m
-CONFIG_I82092=m
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y

arch/powerpc/configs/ppc6xx_defconfig

@@ -72,8 +72,6 @@ CONFIG_PCI_MSI=y
 CONFIG_PCCARD=y
 CONFIG_YENTA=y
 CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
 CONFIG_ADVANCED_OPTIONS=y
 CONFIG_NET=y
 CONFIG_PACKET=y

arch/x86/kernel/resource.c

@@ -62,7 +62,7 @@ void arch_remove_reservations(struct resource *avail)
 	/*
 	 * Trim out BIOS area (high 2MB) and E820 regions. We do not remove
 	 * the low 1MB unconditionally, as this area is needed for some ISA
-	 * cards requiring a memory range, e.g. the i82365 PCMCIA controller.
+	 * cards requiring a memory range.
 	 */
 	if (avail->flags & IORESOURCE_MEM) {
 		resource_clip(avail, BIOS_ROM_BASE, BIOS_ROM_END);

drivers/pci/quirks.c

@@ -1296,9 +1296,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C597_0,	quirk_vt
 
 /*
  * CardBus controllers have a legacy base address that enables them to
- * respond as i82365 pcmcia controllers.  We don't want them to do this
- * even if the Linux CardBus driver is not loaded, because the Linux i82365
- * driver does not (and should not) handle CardBus.
+ * respond as i82365 PCMCIA controllers.  We don't want them to do this.
  */
 static void quirk_cardbus_legacy(struct pci_dev *dev)
 {

drivers/pcmcia/Kconfig

@@ -119,36 +119,6 @@ config PD6729
 	  This provides support for the Cirrus PD6729 PCI-to-PCMCIA bridge
 	  device, found in some older laptops and PCMCIA card readers.
 
-config I82092
-	tristate "i82092 compatible bridge support"
-	depends on PCMCIA && PCI && HAS_IOPORT
-	select PCCARD_NONSTATIC
-	help
-	  This provides support for the Intel I82092AA PCI-to-PCMCIA bridge device,
-	  found in some older laptops and more commonly in evaluation boards for the
-	  chip.
-
-config I82365
-	tristate "i82365 compatible bridge support"
-	depends on PCMCIA && ISA
-	select PCCARD_NONSTATIC
-	help
-	  Say Y here to include support for ISA-bus PCMCIA host bridges that
-	  are register compatible with the Intel i82365.  These are found on
-	  older laptops and ISA-bus card readers for desktop systems.  A
-	  "bridge" is the hardware inside your computer that PCMCIA cards are
-	  plugged into. If unsure, say N.
-
-config TCIC
-	tristate "Databook TCIC host bridge support"
-	depends on PCMCIA && ISA
-	select PCCARD_NONSTATIC
-	help
-	  Say Y here to include support for the Databook TCIC family of PCMCIA
-	  host bridges. These are only found on a handful of old systems.
-	  "Bridge" is the name used for the hardware inside your computer that
-	  PCMCIA cards are plugged into. If unsure, say N.
-
 config PCMCIA_ALCHEMY_DEVBOARD
 	tristate "Alchemy Db/Pb1xxx PCMCIA socket services"
 	depends on MIPS_DB1XXX && PCMCIA

drivers/pcmcia/Makefile

@@ -20,9 +20,6 @@ obj-$(CONFIG_PCCARD)				+= pcmcia_rsrc.o
 obj-$(CONFIG_YENTA) 				+= yenta_socket.o
 
 obj-$(CONFIG_PD6729)				+= pd6729.o
-obj-$(CONFIG_I82365)				+= i82365.o
-obj-$(CONFIG_I82092)				+= i82092.o
-obj-$(CONFIG_TCIC)				+= tcic.o
 obj-$(CONFIG_PCMCIA_SOC_COMMON)			+= soc_common.o
 obj-$(CONFIG_PCMCIA_SA11XX_BASE)		+= sa11xx_base.o
 obj-$(CONFIG_PCMCIA_SA1100)			+= sa1100_cs.o