Merge remote-tracking branch 'spi/topic/imx' into spi-next

[~andy/linux] / arch / arm / mach-orion5x / Kconfig

diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index 0673f0c10432536b6cb22e0a92ddfb495aac6bd9..2cb2f06c20f59130e2b34fc793c67b2a65be3043 100644 (file)
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -2,6 +2,13 @@ if ARCH_ORION5X
 
 menu "Orion Implementations"
 
 
 menu "Orion Implementations"
 

+config ARCH_ORION5X_DT
+       bool "Marvell Orion5x Flattened Device Tree"
+       select USE_OF
+       help
+         Say 'Y' here if you want your kernel to support the
+         Marvell Orion5x using flattened device tree.
+

 config MACH_DB88F5281
        bool "Marvell Orion-2 Development Board"
        select I2C_BOARDINFO
 config MACH_DB88F5281
        bool "Marvell Orion-2 Development Board"
        select I2C_BOARDINFO


@@ -96,12 +103,13 @@ config MACH_MV2120
          Say 'Y' here if you want your kernel to support the
          HP Media Vault mv2120 or mv5100.
 
          Say 'Y' here if you want your kernel to support the
          HP Media Vault mv2120 or mv5100.
 

-config MACH_EDMINI_V2
-       bool "LaCie Ethernet Disk mini V2"
+config MACH_EDMINI_V2_DT
+       bool "LaCie Ethernet Disk mini V2 (Flattened Device Tree)"

        select I2C_BOARDINFO
        select I2C_BOARDINFO

+       select ARCH_ORION5X_DT

        help
          Say 'Y' here if you want your kernel to support the
        help
          Say 'Y' here if you want your kernel to support the

-         LaCie Ethernet Disk mini V2.
+         LaCie Ethernet Disk mini V2 (Flattened Device Tree).

 
 config MACH_D2NET
        bool "LaCie d2 Network"
 
 config MACH_D2NET
        bool "LaCie d2 Network"