diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2015-09-08 21:20:02 +0100 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2015-09-08 21:20:02 +0100 |
commit | bcf80c1db25a698dc9d79f58f227b7c392f7899a (patch) | |
tree | 214c5c728c8e44aa843aae630d7df5668fbee052 /config-arm64 | |
parent | 727908fdd83d19b4d34311e9b3d73e2a2d168a51 (diff) | |
download | kernel-bcf80c1db25a698dc9d79f58f227b7c392f7899a.tar.gz kernel-bcf80c1db25a698dc9d79f58f227b7c392f7899a.tar.xz kernel-bcf80c1db25a698dc9d79f58f227b7c392f7899a.zip |
Config updates for ARMv7/aarch64
Diffstat (limited to 'config-arm64')
-rw-r--r-- | config-arm64 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config-arm64 b/config-arm64 index 5773c1cb5..fba785470 100644 --- a/config-arm64 +++ b/config-arm64 @@ -39,7 +39,6 @@ CONFIG_ARM_SMMU_V3=y CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_ARM64_64K_PAGES=y -# CONFIG_COMPAT is not set CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y @@ -146,6 +145,9 @@ CONFIG_AMD_XGBE_PHY=m CONFIG_POWER_RESET_HISI=y CONFIG_HISI_THERMAL=m +# ThunderX +# CONFIG_MDIO_OCTEON is not set + CONFIG_NET_VENDOR_MELLANOX=y CONFIG_MLX4_EN=m CONFIG_MLX4_EN_DCB=y @@ -164,8 +166,6 @@ CONFIG_BTT=y CONFIG_ND_BTT=m CONFIG_ND_BLK=m -CONFIG_MDIO_OCTEON=m - # CONFIG_SND_SOC is not set # CONFIG_PMIC_OPREGION is not set |