diff options
| author |   Olof Johansson <olof@lixom.net> | 2014-07-07 22:29:48 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-07 22:29:48 -0700 |
| commit | 73290cc9c0c269605227c4f75b2727c325ebc5fd (patch) | |
| tree | 8a9da43ce605f16b1caff1f22105267913ac1aca | |
| parent | Merge tag 'renesas-defconfig-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig (diff) | |
| parent | ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2 (diff) | |
| download | linux-rng-73290cc9c0c269605227c4f75b2727c325ebc5fd.tar.xz linux-rng-73290cc9c0c269605227c4f75b2727c325ebc5fd.zip | |
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: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/multi_v5_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/mvebu_v5_defconfig | 2 |
2 files changed, 4 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 diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig index 27c732fdf21e..b9892f8739fb 100644 --- a/arch/arm/configs/mvebu_v5_defconfig +++ b/arch/arm/configs/mvebu_v5_defconfig @@ -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 |