Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / arch / frv / Kconfig

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index c5e69abb4889f8956f1e4cd13466f3aaf34e94b4..a685910d2d5ce562f36f8f4ae02811390600682c 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -8,6 +8,7 @@ config FRV
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
+       select GENERIC_CPU_DEVICES
 
 config ZONE_DMA
        bool
@@ -317,6 +318,7 @@ config PCI
        bool "Use PCI"
        depends on MB93090_MB00
        default y
+       select GENERIC_PCI_IOMAP
        help
          Some FR-V systems (such as the MB93090-MB00 VDK) have PCI
          onboard. If you have one of these boards and you wish to use the PCI