Merge tag 'usb-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[firefly-linux-kernel-4.4.55.git] / drivers / pcmcia / Kconfig

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index a65f821f52eb2ab882754cb16e9af9ae5b3ea06b..d3c378b4db6c5697d2daf903861b11b1bdd44ad5 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -277,7 +277,6 @@ config AT91_CF
        tristate "AT91 CompactFlash Controller"
        depends on PCI
        depends on PCMCIA && ARCH_AT91
-       depends on !ARCH_MULTIPLATFORM
        help
          Say Y here to support the CompactFlash controller on AT91 chips.
          Or choose M to compile the driver as a module named "at91_cf".