Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73290cc9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-defconfig-3.17' of git://git.infradead.org/linux-mvebu into next/defconfig 

Merge "mvebu defconfig changes for v3.17" from Jason Cooper:

- mvebu (v5)
  * add LaCie 2Big and 5Big Network v2

- multi (v5)
  * add LaCie 2Big and 5Big Network v2

* tag 'mvebu-defconfig-3.17' of git://git.infradead.org/linux-mvebu

:
  ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2
  ARM: mvebu: Add LaCie 2Big and 5Big Network v2

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents dcead424 5658d585

arch/arm/configs/multi_v5_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/mvebu_v5_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,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_CPU_FEROCEON_OLD_ID is not set

CONFIG_PCI_MVEBU=y

CONFIG_PREEMPT=y
@@ -89,6 +90,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