Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-linux.git] / arch / arm / mach-orion5x / Kconfig

diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index a9ad95f000a15cbad7e09710c42de0152ca27c59..a2af15822fcb85d6e9a16d0e2d9455c7df0c5dd0 100644 (file)
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -28,14 +28,14 @@ config ARCH_ORION5X_DT
 
 config MACH_DB88F5281
        bool "Marvell Orion-2 Development Board"
-       select I2C_BOARDINFO
+       select I2C_BOARDINFO if I2C
        help
          Say 'Y' here if you want your kernel to support the
          Marvell Orion-2 (88F5281) Development Board
 
 config MACH_RD88F5182
        bool "Marvell Orion-NAS Reference Design"
-       select I2C_BOARDINFO
+       select I2C_BOARDINFO if I2C
        help
          Say 'Y' here if you want your kernel to support the
          Marvell Orion-NAS (88F5182) RD2
@@ -43,14 +43,14 @@ config MACH_RD88F5182
 config MACH_RD88F5182_DT
        bool "Marvell Orion-NAS Reference Design (Flattened Device Tree)"
        select ARCH_ORION5X_DT
-       select I2C_BOARDINFO
+       select I2C_BOARDINFO if I2C
        help
          Say 'Y' here if you want your kernel to support the Marvell
          Orion-NAS (88F5182) RD2, Flattened Device Tree.
 
 config MACH_KUROBOX_PRO
        bool "KuroBox Pro"
-       select I2C_BOARDINFO
+       select I2C_BOARDINFO if I2C
        help
          Say 'Y' here if you want your kernel to support the
          KuroBox Pro platform.
@@ -58,7 +58,7 @@ config MACH_KUROBOX_PRO
 config MACH_DNS323
        bool "D-Link DNS-323"
        select GENERIC_NET_UTILS
-       select I2C_BOARDINFO
+       select I2C_BOARDINFO if I2C
        help
          Say 'Y' here if you want your kernel to support the
          D-Link DNS-323 platform.
@@ -78,7 +78,7 @@ config MACH_TERASTATION_PRO2
 
 config MACH_LINKSTATION_PRO
        bool "Buffalo Linkstation Pro/Live"
-       select I2C_BOARDINFO
+       select I2C_BOARDINFO if I2C
        help
          Say 'Y' here if you want your kernel to support the
          Buffalo Linkstation Pro/Live platform. Both v1 and
@@ -86,7 +86,7 @@ config MACH_LINKSTATION_PRO
 
 config MACH_LINKSTATION_LSCHL
        bool "Buffalo Linkstation Live v3 (LS-CHL)"
-       select I2C_BOARDINFO
+       select I2C_BOARDINFO if I2C
        help
          Say 'Y' here if you want your kernel to support the
          Buffalo Linkstation Live v3 (LS-CHL) platform.
@@ -100,7 +100,7 @@ config MACH_LINKSTATION_MINI
 
 config MACH_LINKSTATION_LS_HGL
        bool "Buffalo Linkstation LS-HGL"
-       select I2C_BOARDINFO
+       select I2C_BOARDINFO if I2C
        help
          Say 'Y' here if you want your kernel to support the
          Buffalo Linkstation LS-HGL platform.
@@ -139,7 +139,7 @@ config MACH_D2NET_DT
 
 config MACH_NET2BIG
        bool "LaCie 2Big Network"
-       select I2C_BOARDINFO
+       select I2C_BOARDINFO if I2C
        help
          Say 'Y' here if you want your kernel to support the
          LaCie 2Big Network NAS.