github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 08:33:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mvebu defconfig changes for v3.17

Browse Source 
- mvebu (v5)
     - add LaCie 2Big and 5Big Network v2
 
  - multi (v5)
     - add LaCie 2Big and 5Big Network v2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTrWhAAAoJEP45WPkGe8ZnJ3IP/316dhwcTy6Viv1Z0NH9dKMu
 RZdlAwHmc1969/Z1n4DerQ6jC30kCQPPfeK/+a9mU4UuBQ7yZ6j1PmadA4AWOQPE
 2j4O7XKjUIepm2wif17mhW/n5XjINetnOrTyUpwNMtQ/UE4CubO+zVyDEn+Oeqzn
 Sdza21S/8/iDxE5h4QakqKORVOCiZIt5+a1MdNifS9bOUQ0RuT0nuJCapYOsiVvB
 W46iRSJhdlLIKbfQfRYgRrZevXuvRpf+9QYLTO0TcyhBkEDNFX9iTjn40wqbvpWm
 21LTw17yfTjYQWxAE2HcdmcSJo6lN7CYWp+YnlTXZr8d8pylk9sSqQO6VK5HCZPh
 sZ+ZEft4lFSCZ4i1yRxv9epUE6JAm1thgPSgi+PuXWoAdcYmta+ASA7JZ+qlCB3F
 cKphd2BpbWLjDXSiJCjiH6J5rlozs+JD7uJSY2uLQ9K50Y1Z0wmXPK8L2PKKEKuN
 JYwT35s8Fc4JLApJuhSP4xMSY1mn7KAHN/uxN5m5fgNifVYxC/wS0Qg9vz0UTDil
 3UHv3Dc3yK6bffBjke/w6DJAgDYbr15mQuB9iuNzLv6ekuWN6izEvacvjwgpiQfl
 0QbRLkzfluaI3YOzEykWK50+PvgLsxsoTil3a9s2QEEJJ1RUwm28lVM1zgk2RZbP
 2wNn9Vu8JXDmNbTCSWRw
 =tnk8
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2014-07-07 22:29:48 -07:00
commit 73290cc9c0
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/multi_v5_defconfig
View File

@ -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

2
arch/arm/configs/mvebu_v5_defconfig
View File

@ -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