summaryrefslogtreecommitdiffstats
path: root/arch/arc/plat-sim/platform.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2017-08-28 21:00:44 +0200
committerJens Axboe <axboe@kernel.dk>2017-08-28 21:00:44 +0200
commitcd996fb47c360320cf25ac9503c16de085ea9cfc (patch)
tree38a4730b2c031afe7daf632064f9687f1e09194e /arch/arc/plat-sim/platform.c
parentblock: fix warning when I/O elevator is changed as request_queue is being rem... (diff)
parentLinux 4.13-rc7 (diff)
downloadlinux-cd996fb47c360320cf25ac9503c16de085ea9cfc.tar.xz
linux-cd996fb47c360320cf25ac9503c16de085ea9cfc.zip
Merge tag 'v4.13-rc7' into for-4.14/block-postmerge
Linux 4.13-rc7 Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'arch/arc/plat-sim/platform.c')
-rw-r--r--arch/arc/plat-sim/platform.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arc/plat-sim/platform.c b/arch/arc/plat-sim/platform.c
index aea87389e44b..5cda56b1a2ea 100644
--- a/arch/arc/plat-sim/platform.c
+++ b/arch/arc/plat-sim/platform.c
@@ -20,11 +20,14 @@
*/
static const char *simulation_compat[] __initconst = {
+#ifdef CONFIG_ISA_ARCOMPACT
"snps,nsim",
- "snps,nsim_hs",
"snps,nsimosci",
+#else
+ "snps,nsim_hs",
"snps,nsimosci_hs",
"snps,zebu_hs",
+#endif
NULL,
};