diff options
author | Mark Brown <broonie@kernel.org> | 2017-08-30 22:15:31 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-08-30 22:15:31 +0100 |
commit | b388dc1f62a9bdd9c4758a0664e61d0f9a9da519 (patch) | |
tree | 696fd3c245700ee59ebcf3a65b90f8773b904624 /arch/arc/configs/nsimosci_defconfig | |
parent | 6969b2bae6dbe7f277a7c018b66d2f3ad662129f (diff) | |
parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) | |
download | lwn-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.tar.gz lwn-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.zip |
Merge tag 'v4.13-rc7' into asoc-component
Linux 4.13-rc7
Diffstat (limited to 'arch/arc/configs/nsimosci_defconfig')
-rw-r--r-- | arch/arc/configs/nsimosci_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig index f6fb3d26557e..6168ce2ac2ef 100644 --- a/arch/arc/configs/nsimosci_defconfig +++ b/arch/arc/configs/nsimosci_defconfig @@ -23,7 +23,6 @@ CONFIG_MODULES=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set -CONFIG_ARC_PLAT_SIM=y CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci" # CONFIG_COMPACTION is not set CONFIG_NET=y |