summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2014-05-26 21:29:51 +0200
committerJason Cooper <jason@lakedaemon.net>2014-06-20 20:50:23 +0000
commit5658d58545388850c77a070fb3b882ddd958eb88 (patch)
tree5f2420b8a396ceea28b64fcb761ee746fd613236
parent15c0b54474dc2a037a4ee1e71aee40278c01eba6 (diff)
downloadblackbird-op-linux-5658d58545388850c77a070fb3b882ddd958eb88.tar.gz
blackbird-op-linux-5658d58545388850c77a070fb3b882ddd958eb88.zip
ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2
Enable building LaCie 2Big and 5Big Network v2 in the multi v5 kernel. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1401132591-26305-5-git-send-email-andrew@lunn.ch Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/configs/multi_v5_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index 5ebfa8bf8509..018bef9fa7e8 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_MVEBU=y
CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_NETXBIG=y
CONFIG_ARCH_MXC=y
CONFIG_MACH_IMX25_DT=y
CONFIG_MACH_IMX27_DT=y
@@ -94,6 +95,7 @@ CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_GPIO=y
CONFIG_POWER_RESET_QNAP=y
CONFIG_SENSORS_ADT7475=y
+CONFIG_SENSORS_G762=y
CONFIG_SENSORS_LM63=y
CONFIG_SENSORS_LM75=y
CONFIG_SENSORS_LM85=y
OpenPOWER on IntegriCloud